diff --git a/tests/aggregator/10aggr_join.t b/tests/aggregator/10aggr_join.t
index 4ceb00a..dab7a4b 100644
--- a/tests/aggregator/10aggr_join.t
+++ b/tests/aggregator/10aggr_join.t
@@ -37,8 +37,8 @@ my $ret;
 
 ok(1); # modules load fine
 
-my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:10153', 'CORE1');
-my $iss2 = new Ham::APRS::IS_Fake('127.0.0.1:10154', 'CORE2');
+my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:54153', 'CORE1');
+my $iss2 = new Ham::APRS::IS_Fake('127.0.0.1:54154', 'CORE2');
 ok(1); # there's a working socket
 
 $iss1->bind_and_listen();
@@ -66,7 +66,7 @@ ok($read1, qr/^user TESTING pass 31421 /, "Did not receive 'user' login command
 ok($read2, qr/^user TESTING pass 31421 /, "Did not receive 'user' login command on connection 2");
 
 # create client connection
-my $cl = new Ham::APRS::IS("localhost:10152", 'CL1ENT');
+my $cl = new Ham::APRS::IS("localhost:55152", 'CL1ENT');
 ok(defined $cl, 1, "Failed to initialize Ham::APRS::IS");
 $ret = $cl->connect('retryuntil' => 8);
 ok($ret, 1, "Failed to connect to the server: " . $cl->{'error'});
diff --git a/tests/aggregator/20socket-timeouts.t b/tests/aggregator/20socket-timeouts.t
index f855d3e..c4127e2 100644
--- a/tests/aggregator/20socket-timeouts.t
+++ b/tests/aggregator/20socket-timeouts.t
@@ -19,7 +19,7 @@ my $ret;
 
 ok(1); # modules load fine
 
-my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:10153', 'CORE1');
+my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:54153', 'CORE1');
 ok(1); # there's a working socket
 
 $iss1->bind_and_listen();
@@ -50,7 +50,7 @@ warn sprintf("\ntimeout on uplink socket took %.3f s, should take 10s\n", $t_dif
 ok($t_dif > 9 && $t_dif < 15);
 
 # create client connection
-my $cl = new Ham::APRS::IS("localhost:10152", 'CL1ENT');
+my $cl = new Ham::APRS::IS("localhost:55152", 'CL1ENT');
 ok(defined $cl, 1, "Failed to initialize Ham::APRS::IS");
 $ret = $cl->connect('retryuntil' => 8);
 ok($ret, 1, "Failed to connect to the server: " . $cl->{'error'});
diff --git a/tests/cfg-aprsc/aggregator b/tests/cfg-aprsc/aggregator
index aa1a405..4236b2d 100644
--- a/tests/cfg-aprsc/aggregator
+++ b/tests/cfg-aprsc/aggregator
@@ -46,13 +46,13 @@ ClientTimeout		20s
 #		msgonly - messages only
 #		userfilter - user-specified filters
 #
-Listen "Messages only"                            messageonly tcp 0.0.0.0   1314   t/m
-Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  10152   t/c*
-Listen "Igate port"                               igate       tcp 0.0.0.0  14580
-Listen "Client-only port"                         clientonly  tcp 0.0.0.0  14581
+Listen "Messages only"                            messageonly tcp 0.0.0.0  55314   t/m
+Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  55152   t/c*
+Listen "Igate port"                               igate       tcp 0.0.0.0  55580
+Listen "Client-only port"                         clientonly  tcp 0.0.0.0  55581
 
-Uplink full1 multiro tcp 127.0.0.1 10153
-Uplink full2 multiro tcp 127.0.0.1 10154
+Uplink full1 multiro tcp 127.0.0.1 54153
+Uplink full2 multiro tcp 127.0.0.1 54154
 
 ### Internals ############
 # Only use 3 threads in these basic tests, to keep startup/shutdown times
diff --git a/tests/cfg-aprsc/basic b/tests/cfg-aprsc/basic
index 594a6ee..8d6c137 100644
--- a/tests/cfg-aprsc/basic
+++ b/tests/cfg-aprsc/basic
@@ -45,10 +45,10 @@ ClientTimeout		48h
 #		msgonly - messages only
 #		userfilter - user-specified filters
 #
-Listen "Messages only"                            messageonly tcp 0.0.0.0   1314   t/m
-Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  10152   t/c*
-Listen "Igate port"                               igate       tcp 0.0.0.0  14580
-Listen "Client-only port"                         clientonly  tcp 0.0.0.0  14581
+Listen "Messages only"                            messageonly tcp 0.0.0.0  55314   t/m
+Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  55152   t/c*
+Listen "Igate port"                               igate       tcp 0.0.0.0  55580
+Listen "Client-only port"                         clientonly  tcp 0.0.0.0  55581
 
 Uplink full1 full tcp 127.0.0.1 10153
 
diff --git a/tests/cfg-aprsc/uplinks b/tests/cfg-aprsc/uplinks
index 9382fa9..aca2f6c 100644
--- a/tests/cfg-aprsc/uplinks
+++ b/tests/cfg-aprsc/uplinks
@@ -45,13 +45,13 @@ ClientTimeout		48h
 #		msgonly - messages only
 #		userfilter - user-specified filters
 #
-Listen "Messages only"                            messageonly tcp 0.0.0.0   1314   t/m
-Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  10152   t/c*
-Listen "Igate port"                               igate       tcp 0.0.0.0  14580
-Listen "Client-only port"                         clientonly  tcp 0.0.0.0  14581
+Listen "Messages only"                            messageonly tcp 0.0.0.0  55314   t/m
+Listen "Full feed with CWOP"                      fullfeed    tcp 0.0.0.0  55152   t/c*
+Listen "Igate port"                               igate       tcp 0.0.0.0  55580
+Listen "Client-only port"                         clientonly  tcp 0.0.0.0  55581
 
-Uplink core1 multiro tcp 127.0.0.1 10153
-Uplink core2 multiro tcp ::1 10153
+Uplink core1 multiro tcp 127.0.0.1 54153
+Uplink core2 multiro tcp ::1 54153
 
 ### Internals ############
 # Only use 3 threads in these basic tests, to keep startup/shutdown times
diff --git a/tests/t/01login.t b/tests/t/01login.t
index ea4a888..89ad58d 100644
--- a/tests/t/01login.t
+++ b/tests/t/01login.t
@@ -15,7 +15,7 @@ ok(defined $p, 1, "Failed to initialize product runner");
 ok($p->start(), 1, "Failed to start product");
 
 # connect to the server
-my $is = new Ham::APRS::IS("localhost:10152", "N0CALL");
+my $is = new Ham::APRS::IS("localhost:55152", "N0CALL");
 ok(defined $is, 1, "Failed to initialize Ham::APRS::IS");
 
 my $ret = $is->connect('retryuntil' => 8);
diff --git a/tests/t/10dupecheck.t b/tests/t/10dupecheck.t
index d7b86a9..10c3f69 100644
--- a/tests/t/10dupecheck.t
+++ b/tests/t/10dupecheck.t
@@ -21,10 +21,10 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_tx = new Ham::APRS::IS("localhost:14580", $login);
+my $i_tx = new Ham::APRS::IS("localhost:55580", $login);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 
-my $i_rx = new Ham::APRS::IS("localhost:10152", "N0CALL-2");
+my $i_rx = new Ham::APRS::IS("localhost:55152", "N0CALL-2");
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
 my $ret;
diff --git a/tests/t/20qconstr-verified.t b/tests/t/20qconstr-verified.t
index 0301a3b..d043ffc 100644
--- a/tests/t/20qconstr-verified.t
+++ b/tests/t/20qconstr-verified.t
@@ -18,13 +18,13 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_tx = new Ham::APRS::IS("localhost:14581", $login);
+my $i_tx = new Ham::APRS::IS("localhost:55581", $login);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 
-my $i_rx = new Ham::APRS::IS("localhost:10152", "N0CALL-2");
+my $i_rx = new Ham::APRS::IS("localhost:55152", "N0CALL-2");
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
-# connect, initially to the client-only port 14581
+# connect, initially to the client-only port 55581
 
 my $ret;
 $ret = $i_tx->connect('retryuntil' => 8);
@@ -96,14 +96,14 @@ istest::txrx(\&ok, $i_tx, $i_rx,
 
 $ret = $i_tx->disconnect();
 ok($ret, 1, "Failed to disconnect from the server: " . $i_rx->{'error'});
-$i_tx = new Ham::APRS::IS("localhost:10152", $login);
+$i_tx = new Ham::APRS::IS("localhost:55152", $login);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 $ret = $i_tx->connect('retryuntil' => 8);
 ok($ret, 1, "Failed to connect to the server: " . $i_tx->{'error'});
 
 # for loop testing, also make a second connection
 my $login_second = "MYC4LL-5";
-$i_tx2 = new Ham::APRS::IS("localhost:10152", $login_second);
+$i_tx2 = new Ham::APRS::IS("localhost:55152", $login_second);
 ok(defined $i_tx2, 1, "Failed to initialize Ham::APRS::IS");
 $ret = $i_tx2->connect('retryuntil' => 8);
 ok($ret, 1, "Failed to connect twice to the server: " . $i_tx->{'error'});
diff --git a/tests/t/21qconstr-unver.t b/tests/t/21qconstr-unver.t
index 451491e..1ac8ad2 100644
--- a/tests/t/21qconstr-unver.t
+++ b/tests/t/21qconstr-unver.t
@@ -17,10 +17,10 @@ ok($p->start(), 1, "Failed to start product");
 
 $tx_call = "N0CALL-1";
 $server_call = "TESTING";
-$i_tx = new Ham::APRS::IS("localhost:10152", $tx_call, 'nopass' => 1);
+$i_tx = new Ham::APRS::IS("localhost:55152", $tx_call, 'nopass' => 1);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 
-$i_rx = new Ham::APRS::IS("localhost:10152", "N0CALL-2", 'nopass' => 1);
+$i_rx = new Ham::APRS::IS("localhost:55152", "N0CALL-2", 'nopass' => 1);
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
 # connect
diff --git a/tests/t/22qconstr-uplink.t b/tests/t/22qconstr-uplink.t
index 06a52ea..c3d7d35 100644
--- a/tests/t/22qconstr-uplink.t
+++ b/tests/t/22qconstr-uplink.t
@@ -10,11 +10,11 @@ use Ham::APRS::IS;
 use Ham::APRS::IS_Fake;
 ok(1); # If we made it this far, we're ok.
 
-my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:10153', 'CORE1');
+my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:54153', 'CORE1');
 ok(defined $iss1, 1, "Test failed to initialize listening server socket");
 $iss1->bind_and_listen();
 
-my $iss6 = new Ham::APRS::IS_Fake('[::1]:10153', 'CORE6');
+my $iss6 = new Ham::APRS::IS_Fake('[::1]:54153', 'CORE6');
 ok(defined $iss6, 1, "Test failed to initialize listening server socket on IPv6");
 $iss6->bind_and_listen();
 
@@ -25,7 +25,7 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_rx = new Ham::APRS::IS("localhost:10152", $login);
+my $i_rx = new Ham::APRS::IS("localhost:55152", $login);
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
 my $is1 = $iss1->accept();
diff --git a/tests/t/23qconstr-long.t b/tests/t/23qconstr-long.t
index 3b903a6..04ebf8f 100644
--- a/tests/t/23qconstr-long.t
+++ b/tests/t/23qconstr-long.t
@@ -38,11 +38,11 @@ BEGIN {
 
 ok(1); # If we made it this far, we're ok.
 
-my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:10153', 'CORE1');
+my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:54153', 'CORE1');
 ok(defined $iss1, 1, "Test failed to initialize listening server socket");
 $iss1->bind_and_listen();
 
-my $iss6 = new Ham::APRS::IS_Fake('[::1]:10153', 'CORE6');
+my $iss6 = new Ham::APRS::IS_Fake('[::1]:54153', 'CORE6');
 ok(defined $iss6, 1, "Test failed to initialize listening server socket on IPv6");
 $iss6->bind_and_listen();
 
@@ -53,7 +53,7 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_rx = new Ham::APRS::IS("localhost:10152", $login);
+my $i_rx = new Ham::APRS::IS("localhost:55152", $login);
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
 my $is1 = $iss1->accept();
diff --git a/tests/t/27digipath-long.t b/tests/t/27digipath-long.t
index bcee28b..77237d3 100644
--- a/tests/t/27digipath-long.t
+++ b/tests/t/27digipath-long.t
@@ -38,11 +38,11 @@ BEGIN {
 
 ok(1); # If we made it this far, we're ok.
 
-my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:10153', 'CORE1');
+my $iss1 = new Ham::APRS::IS_Fake('127.0.0.1:54153', 'CORE1');
 ok(defined $iss1, 1, "Test failed to initialize listening server socket");
 $iss1->bind_and_listen();
 
-my $iss6 = new Ham::APRS::IS_Fake('[::1]:10153', 'CORE6');
+my $iss6 = new Ham::APRS::IS_Fake('[::1]:54153', 'CORE6');
 ok(defined $iss6, 1, "Test failed to initialize listening server socket on IPv6");
 $iss6->bind_and_listen();
 
@@ -53,7 +53,7 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_rx = new Ham::APRS::IS("localhost:10152", $login);
+my $i_rx = new Ham::APRS::IS("localhost:55152", $login);
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
 my $is1 = $iss1->accept();
diff --git a/tests/t/30parser-filter.t b/tests/t/30parser-filter.t
index c03fea2..f5afb2d 100644
--- a/tests/t/30parser-filter.t
+++ b/tests/t/30parser-filter.t
@@ -22,12 +22,12 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_tx = new Ham::APRS::IS("localhost:14580", $login);
+my $i_tx = new Ham::APRS::IS("localhost:55580", $login);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 
 # first filter is for uncompressed packet, second for compressed,
 # third for mic-e, fourth for prefix filter test
-my $i_rx = new Ham::APRS::IS("localhost:14581", "N0CALL-2",
+my $i_rx = new Ham::APRS::IS("localhost:55581", "N0CALL-2",
 	'filter' => 'r/60.4752/25.0947/1 r/60.0520/24.5045/1 r/37.0887/-76.4585/100 p/OG/OF3/N');
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");
 
diff --git a/tests/t/31parser-nmea.t b/tests/t/31parser-nmea.t
index 18b0d00..86e9cf4 100644
--- a/tests/t/31parser-nmea.t
+++ b/tests/t/31parser-nmea.t
@@ -19,10 +19,10 @@ ok($p->start(), 1, "Failed to start product");
 
 my $login = "N0CALL-1";
 my $server_call = "TESTING";
-my $i_tx = new Ham::APRS::IS("localhost:14580", $login);
+my $i_tx = new Ham::APRS::IS("localhost:55580", $login);
 ok(defined $i_tx, 1, "Failed to initialize Ham::APRS::IS");
 
-my $i_rx = new Ham::APRS::IS("localhost:14581", "N0CALL-2",
+my $i_rx = new Ham::APRS::IS("localhost:55581", "N0CALL-2",
 	'filter' => 'r/-38.5452/-58.7366/1 s/->' # GPRMC
 	);
 ok(defined $i_rx, 1, "Failed to initialize Ham::APRS::IS");