diff --git a/apps/cic-eth/cic_eth/pytest/fixtures_config.py b/apps/cic-eth/cic_eth/pytest/fixtures_config.py
index 27d7c9cc..e44078f9 100644
--- a/apps/cic-eth/cic_eth/pytest/fixtures_config.py
+++ b/apps/cic-eth/cic_eth/pytest/fixtures_config.py
@@ -8,15 +8,14 @@ import confini
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = os.path.dirname(os.path.dirname(script_dir))
+config_dir = os.path.join(root_dir, 'cic_eth', 'data', 'config')
 logg = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope='session')
 def load_config():
-    config_dir = os.environ.get('CONFINI_DIR')
-    if config_dir == None:
-        config_dir = os.path.join(root_dir, 'config/test')
-    conf = confini.Config(config_dir, 'CICTEST')
+    override_config_dir = os.path.join(root_dir, 'config', 'test')
+    conf = confini.Config(config_dir, 'CICTEST', override_dirs=[override_config_dir])
     conf.process()
     logg.debug('config {}'.format(conf))
     return conf
diff --git a/apps/cic-eth/config/test/accounts.ini b/apps/cic-eth/config/test/accounts.ini
deleted file mode 100644
index 819a83bc..00000000
--- a/apps/cic-eth/config/test/accounts.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[accounts]
-writer_address = 
diff --git a/apps/cic-eth/config/test/bancor.ini b/apps/cic-eth/config/test/bancor.ini
deleted file mode 100644
index 961c0e6b..00000000
--- a/apps/cic-eth/config/test/bancor.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[bancor]
-dir = tests/testdata/bancor
diff --git a/apps/cic-eth/config/test/celery.ini b/apps/cic-eth/config/test/celery.ini
index 1f12b77f..30a519c7 100644
--- a/apps/cic-eth/config/test/celery.ini
+++ b/apps/cic-eth/config/test/celery.ini
@@ -1,5 +1,3 @@
 [celery]
 broker_url = filesystem://
 result_url = filesystem://
-#broker_url = redis://
-#result_url = redis://
diff --git a/apps/cic-eth/config/test/chain.ini b/apps/cic-eth/config/test/chain.ini
deleted file mode 100644
index 9fda0988..00000000
--- a/apps/cic-eth/config/test/chain.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[chain]
-spec =
diff --git a/apps/cic-eth/config/test/cic.ini b/apps/cic-eth/config/test/cic.ini
deleted file mode 100644
index d985ae3e..00000000
--- a/apps/cic-eth/config/test/cic.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[cic]
-registry_address = 
-chain_spec = 
-trust_address =
diff --git a/apps/cic-eth/config/test/dispatcher.ini b/apps/cic-eth/config/test/dispatcher.ini
deleted file mode 100644
index f7b270a5..00000000
--- a/apps/cic-eth/config/test/dispatcher.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dispatcher]
-loop_interval = 0.1
diff --git a/apps/cic-eth/config/test/eth.ini b/apps/cic-eth/config/test/eth.ini
deleted file mode 100644
index 4c9edda1..00000000
--- a/apps/cic-eth/config/test/eth.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[eth]
-#ws_provider = ws://localhost:8546
-#ttp_provider = http://localhost:8545
-provider = http://localhost:8545
-gas_provider_address = 
-#chain_id = 
-abi_dir = 
-faucet_giver_address = 
diff --git a/apps/cic-eth/config/test/signer.ini b/apps/cic-eth/config/test/signer.ini
index 0fa1f015..2e1cbc00 100644
--- a/apps/cic-eth/config/test/signer.ini
+++ b/apps/cic-eth/config/test/signer.ini
@@ -1,5 +1,2 @@
 [signer]
-socket_path = /run/crypto-dev-signer/jsonrpc.ipc
-secret = deedbeef
-database_name = signer_test
-dev_keys_path = 
+provider = /run/crypto-dev-signer/jsonrpc.ipc
diff --git a/apps/cic-eth/config/test/ssl.ini b/apps/cic-eth/config/test/ssl.ini
deleted file mode 100644
index bd494729..00000000
--- a/apps/cic-eth/config/test/ssl.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[SSL]
-enable_client = false
-cert_file = 
-key_file =
-password = 
-ca_file =
diff --git a/apps/cic-eth/config/test/syncer.ini b/apps/cic-eth/config/test/syncer.ini
deleted file mode 100644
index 97236743..00000000
--- a/apps/cic-eth/config/test/syncer.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[SYNCER]
-loop_interval = 1