31 files changed, 126 insertions, 122 deletions

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 276b313b7..fef6cfb40 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -16,7 +16,7 @@ PORT = 23355
 
 [do-nothing]
 START_ON_DEMAND = NO
-PORT = 2223
+PORT = 48223
 HOSTNAME = localhost
 BINARY = /will/be/overwritten/by/test_exponential_backoff
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index a13cc8706..420849ba9 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -6,6 +6,6 @@ WAN_QUOTA_IN = 64 kiB
 WAN_QUOTA_OUT = 64 kiB
 
 [core]
-PORT = 2092
+PORT = 52092
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
 
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index ad6d4dc60..c2a459bb9 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -8,7 +8,7 @@ WAN_QUOTA_OUT = 104757600
 
 [test-sts]
 IMMEDIATE_START = YES
-PORT = 9252
+PORT = 59252
 HOSTNAME = localhost
 BINARY = test_core_api_send_to_self
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/dv/test_transport_blacklist_data.conf b/src/dv/test_transport_blacklist_data.conf
index 534a61849..ea55a196b 100644
--- a/src/dv/test_transport_blacklist_data.conf
+++ b/src/dv/test_transport_blacklist_data.conf
@@ -1,5 +1,5 @@
 @INLINE@ template_dv.conf
 
 [transport]
-PORT = 2565
+PORT = 52565
 PLUGINS = tcp 
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 307921ac4..a21fba8a7 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -1,7 +1,7 @@
 @INLINE@ template_dv.conf
 
 [transport]
-PORT = 2565
+PORT = 52565
 PLUGINS = tcp dv
 #PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 42661b25d..6ead78257 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -21,7 +21,7 @@ QUOTA = 100 MB
 
 [transport-tcp]
 BINDTO = 127.0.0.1
-PORT = 4368
+PORT = 54368
 
 [peerinfo]
 NO_IO = YES
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 84de6159e..03850ec06 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -6,7 +6,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/nat-test
 
 [gnunet-nat-server]
 HOSTNAME = localhost
-PORT = 12345
+PORT = 57315
 
 [nat]
 # Are we behind NAT?
diff --git a/src/template/template.conf b/src/template/template.conf
index e5f675a5d..24b123390 100644
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -1,6 +1,10 @@
 [template]
 START_ON_DEMAND = NO
-PORT = 9999
+# for tests please come up with numbers that are
+# unlikely to be in use by anyone. we typically
+# use five digit numbers < 65536 with no "beauty"
+# (no repetitions, no sequences, no popularity).
+PORT = 99999
 HOSTNAME = localhost
 BINARY = gnunet-service-template
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index 50d3f2c04..edb2e2057 100644
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -6,4 +6,4 @@ MAX_PARALLEL_SERVICE_CONNECTIONS = 2
 
 [statistics]
 START_ON_DEMAND = YES
-PORT = 30
+PORT = 59530
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf
index e41e2863c..24ce1b358 100644
--- a/src/testing/test_testing_sharedservices.conf
+++ b/src/testing/test_testing_sharedservices.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-testing/
 
 [testbed-logger]
-PORT = 15000
+PORT = 59132
 UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
 DIR = $GNUNET_TMP/testbed-logger
 
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index cbecc56ed..b667a4854 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -3,10 +3,10 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
 
 [transport-tcp]
-PORT = 2400
+PORT = 52400
 
 [transport-udp]
-PORT = 2401
+PORT = 52401
 
 [transport-wlan]
 INTERFACE = mon0
@@ -17,29 +17,29 @@ INTERFACE = hci0
 TESTMODE = 1
 
 [transport-http_server]
-PORT = 2402
+PORT = 52402
 
 [transport-https_server]
-PORT = 2403
+PORT = 52403
 
 [arm]
-PORT = 2360
+PORT = 52360
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
 
 [statistics]
-PORT = 2361
+PORT = 52361
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
 
 [resolver]
-PORT = 2362
+PORT = 52362
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
 
 [peerinfo]
-PORT = 2363
+PORT = 52363
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerinfo.sock
 
 [transport]
-PORT = 2364
+PORT = 52364
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock
 
 [nat]
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 47c523bcf..1bc607770 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -3,22 +3,22 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
 
 [transport-tcp]
-PORT = 2368
+PORT = 52368
 TIMEOUT = 5 s
 
 [arm]
-PORT = 2366
+PORT = 52366
 
 [statistics]
-PORT = 2367
+PORT = 52367
 
 [resolver]
-PORT = 2364
+PORT = 52364
 
 [peerinfo]
-PORT = 2369
+PORT = 52369
 
 [transport]
-PORT = 2365
+PORT = 52365
 
 
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 201bafd01..b2ff1913f 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1
 [transport-http_client]
 
 [arm]
-PORT = 4015
+PORT = 54015
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
 
 [statistics]
-PORT = 4014
+PORT = 54014
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
 
 [resolver]
-PORT = 4013
+PORT = 54013
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4012
+PORT = 54012
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
 
 [transport]
-PORT = 4011
+PORT = 54011
 PLUGINS = http_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index cdc10516b..3408d9f2e 100644
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -3,29 +3,29 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [transport-http_server]
-PORT = 3010
+PORT = 53010
 USE_IPv6 = NO
 BINDTO = 127.0.0.1
 
 
 [arm]
-PORT = 3015
+PORT = 53015
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
 
 [statistics]
-PORT = 3014
+PORT = 53014
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
 
 [resolver]
-PORT = 3013
+PORT = 53013
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3012
+PORT = 53012
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
 
 [transport]
-PORT = 3011
+PORT = 53011
 PLUGINS = http_server
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
 
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 201bafd01..b2ff1913f 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1
 [transport-http_client]
 
 [arm]
-PORT = 4015
+PORT = 54015
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock
 
 [statistics]
-PORT = 4014
+PORT = 54014
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock
 
 [resolver]
-PORT = 4013
+PORT = 54013
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4012
+PORT = 54012
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock
 
 [transport]
-PORT = 4011
+PORT = 54011
 PLUGINS = http_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index cdc10516b..3408d9f2e 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,29 +3,29 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [transport-http_server]
-PORT = 3010
+PORT = 53010
 USE_IPv6 = NO
 BINDTO = 127.0.0.1
 
 
 [arm]
-PORT = 3015
+PORT = 53015
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock
 
 [statistics]
-PORT = 3014
+PORT = 53014
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock
 
 [resolver]
-PORT = 3013
+PORT = 53013
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3012
+PORT = 53012
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock
 
 [transport]
-PORT = 3011
+PORT = 53011
 PLUGINS = http_server
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock
 
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 3e8895665..94aa534ef 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
 [transport-https_client]
 
 [arm]
-PORT = 4006
+PORT = 54006
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
 
 [statistics]
-PORT = 4005
+PORT = 54005
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
 
 [resolver]
-PORT = 4004
+PORT = 54004
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4003
+PORT = 54003
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
 
 [transport]
-PORT = 4002
+PORT = 54002
 PLUGINS = https_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index e0ff8da9f..8fb8861cd 100644
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -3,28 +3,28 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [transport-https_server]
-PORT = 3001
+PORT = 53001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
 
 [arm]
-PORT = 3006
+PORT = 53006
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
 
 [statistics]
-PORT = 3005
+PORT = 53005
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
 
 [resolver]
-PORT = 3004
+PORT = 53004
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3003
+PORT = 53003
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
 
 [transport]
-PORT = 3002
+PORT = 53002
 PLUGINS = https_server
 UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
 
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 3e8895665..94aa534ef 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -5,23 +5,23 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
 [transport-https_client]
 
 [arm]
-PORT = 4006
+PORT = 54006
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock
 
 [statistics]
-PORT = 4005
+PORT = 54005
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock
 
 [resolver]
-PORT = 4004
+PORT = 54004
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4003
+PORT = 54003
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock
 
 [transport]
-PORT = 4002
+PORT = 54002
 PLUGINS = https_client
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index e0ff8da9f..8fb8861cd 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -3,28 +3,28 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [transport-https_server]
-PORT = 3001
+PORT = 53001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
 
 [arm]
-PORT = 3006
+PORT = 53006
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock
 
 [statistics]
-PORT = 3005
+PORT = 53005
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock
 
 [resolver]
-PORT = 3004
+PORT = 53004
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3003
+PORT = 53003
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock
 
 [transport]
-PORT = 3002
+PORT = 53002
 PLUGINS = https_server
 UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock
 
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 59fbbff5b..0e0cbff24 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -3,29 +3,29 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
 
 [transport-tcp]
-PORT = 4094
+PORT = 54094
 
 [transport-udp]
-PORT = 4094
+PORT = 54094
 
 [arm]
-PORT = 4087
+PORT = 54087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
 
 [statistics]
-PORT = 4088
+PORT = 54088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
 
 [resolver]
-PORT = 4089
+PORT = 54089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4090
+PORT = 54090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
 
 [transport]
-PORT = 4091
+PORT = 54091
 PLUGINS = tcp
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 59fbbff5b..0e0cbff24 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -3,29 +3,29 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/quota-tcp-p1/
 
 [transport-tcp]
-PORT = 4094
+PORT = 54094
 
 [transport-udp]
-PORT = 4094
+PORT = 54094
 
 [arm]
-PORT = 4087
+PORT = 54087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock
 
 [statistics]
-PORT = 4088
+PORT = 54088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock
 
 [resolver]
-PORT = 4089
+PORT = 54089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4090
+PORT = 54090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock
 
 [transport]
-PORT = 4091
+PORT = 54091
 PLUGINS = tcp
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index b7c3159b8..bba75c168 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -3,27 +3,27 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
 
 [transport-udp]
-PORT = 4368
+PORT = 54368
 MAX_BPS = 50000000
 
 [arm]
-PORT = 4087
+PORT = 54087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer1.sock
 
 [statistics]
-PORT = 4088
+PORT = 54088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer1.sock
 
 [resolver]
-PORT = 4089
+PORT = 54089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4090
+PORT = 54090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer1.sock
 
 [transport]
-PORT = 4091
+PORT = 54091
 PLUGINS = udp
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer1.sock
 
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 70e61db05..1cb04038c 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -3,27 +3,27 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [transport-udp]
-PORT = 3368
+PORT = 53368
 MAX_BPS = 50000000
 
 [arm]
-PORT = 3087
+PORT = 53087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer2.sock
 
 [statistics]
-PORT = 3088
+PORT = 53088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer2.sock
 
 [resolver]
-PORT = 3089
+PORT = 53089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3090
+PORT = 53090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer2.sock
 
 [transport]
-PORT = 3091
+PORT = 53091
 PLUGINS = udp
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer2.sock
 
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
index 8d6073b67..a8ee6d77a 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
@@ -3,26 +3,26 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
 
 [arm]
-PORT = 4087
+PORT = 54087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
 
 [statistics]
-PORT = 4088
+PORT = 54088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
 
 [resolver]
-PORT = 4089
+PORT = 54089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4090
+PORT = 54090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
 
 [transport]
-PORT = 4091
+PORT = 54091
 PLUGINS = unix
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
 
 [transport-unix]
-PORT = 4092
+PORT = 54092
 
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index a3a42f739..6edbcac9f 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -3,26 +3,26 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 
 [arm]
-PORT = 3087
+PORT = 53087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
 
 [statistics]
-PORT = 3088
+PORT = 53088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
 
 [resolver]
-PORT = 3089
+PORT = 53089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3090
+PORT = 53090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
 
 [transport]
-PORT = 3091
+PORT = 53091
 PLUGINS = unix
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
 
 [transport-unix]
-PORT = 3368
+PORT = 53368
 
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index d9255705c..59c8d6d9e 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -6,22 +6,22 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer1/
 PORT = 12120
 
 [arm]
-PORT = 4087
+PORT = 54087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock
 
 [statistics]
-PORT = 4088
+PORT = 54088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock
 
 [resolver]
-PORT = 4089
+PORT = 54089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock
 
 [peerinfo]
-PORT = 4090
+PORT = 54090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock
 
 [transport]
-PORT = 4091
+PORT = 54091
 PLUGINS = unix
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index b7ba15d86..8c2f9989e 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -6,26 +6,26 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_quota_compliance_peer2
 PORT = 12136
 
 [arm]
-PORT = 3087
+PORT = 53087
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock
 
 [statistics]
-PORT = 3088
+PORT = 53088
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock
 
 [resolver]
-PORT = 3089
+PORT = 53089
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock
 
 [peerinfo]
-PORT = 3090
+PORT = 53090
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock
 
 [transport]
-PORT = 3091
+PORT = 53091
 PLUGINS = unix
 UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock
 
 [transport-unix]
-PORT = 3368
+PORT = 53368
 
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index 58b8e17b0..c06235a0a 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -2,8 +2,8 @@
 [PATHS]
 
 [transport-tcp]
-PORT = 2094
+PORT = 52094
 
 [transport-udp]
-PORT = 2094
+PORT = 52094
 
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
index 6aa9dbf22..6a2029b09 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -12,7 +12,7 @@ PORT = 0
 TIMEOUT = 5 s
 
 [arm]
-PORT = 1204
+PORT = 51204
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index b8d83ce29..fb2fcecc6 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -12,7 +12,7 @@ PORT = 0
 TIMEOUT = 5 s
 
 [arm]
-PORT = 1204
+PORT = 51204
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]