3 files changed, 2 insertions, 87 deletions

diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 4ece5b096..a13cc8706 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -1,9 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
 
-[arm]
-DEFAULTSERVICES = topology hostlist
-
 [ats]
 WAN_QUOTA_IN = 64 kiB
 WAN_QUOTA_OUT = 64 kiB
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index ebf77997c..83928d04a 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -2,23 +2,13 @@
 [PATHS]
 GNUNET_TEST_HOME = ~/.gnunet/
 
-[arm]
-PORT = 2425 
-DEFAULTSERVICES = core test-sts
-
-[core]
-PORT = 24512
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
-
 [ats]
 WAN_QUOTA_IN = 104857600
 WAN_QUOTA_OUT = 104757600
-PORT = 24571
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [test-sts]
-AUTOSTART = YES
-PORT = 9252 
+FORCESTART = YES
+PORT = 9252
 HOSTNAME = localhost
 BINARY = test_core_api_send_to_self
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index b0acb8395..2184e103a 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -1,9 +1,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-core/
 
-[arm]
-DEFAULTSERVICES =
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -17,81 +14,12 @@ USE_LOCALADDR = NO
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 12470
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
-
 [transport-tcp]
 BINDTO = 127.0.0.1
 
 [transport-udp]
 BROADCAST = NO
 
-[testing]
-WEAKRANDOM = YES
-
 [peerinfo]
 NO_IO = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[multicast]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO