11 files changed, 12 insertions, 12 deletions

diff --git a/src/ats-tests/template_perf_ats.conf b/src/ats-tests/template_perf_ats.conf
index 9d320c3dd..74f608bfb 100644
--- a/src/ats-tests/template_perf_ats.conf
+++ b/src/ats-tests/template_perf_ats.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [testbed]
 # How long should operations wait?
diff --git a/src/conversation/test_conversation.conf b/src/conversation/test_conversation.conf
index 87c4b8f07..e77b41003 100644
--- a/src/conversation/test_conversation.conf
+++ b/src/conversation/test_conversation.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [conversation]
 LINE=1
diff --git a/src/credential/test_credential_defaults.conf b/src/credential/test_credential_defaults.conf
index 328846a10..39f82ad16 100644
--- a/src/credential/test_credential_defaults.conf
+++ b/src/credential/test_credential_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-testing/
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 79344cd66..42661b25d 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-lib/
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 261dab6ed..01825fafe 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-testing/
diff --git a/src/identity-provider/test_idp_defaults.conf b/src/identity-provider/test_idp_defaults.conf
index d7de3ce12..a9a197dea 100644
--- a/src/identity-provider/test_idp_defaults.conf
+++ b/src/identity-provider/test_idp_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-testing/
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 836255163..4e2563a8a 100644
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [testbed]
 HOSTNAME = localhost
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 8c87eeb96..60dcdc0b6 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-regex-api/
diff --git a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
index 1beeba931..14ecf6064 100644
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [paths]
 GNUNET_HOME=$GNUNET_TMP/test-revocation-service
diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index 701789313..df9815fd2 100644
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-social/
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index ddb523986..3f38eeab7 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport-api/