diff --git a/tests/pingpair_blocking/Jamfile b/tests/pingpair_blocking/Jamfile
index 6268f4b..18244ec 100644
--- a/tests/pingpair_blocking/Jamfile
+++ b/tests/pingpair_blocking/Jamfile
@@ -6,7 +6,7 @@ PROJECT_DIRS	= $(PWD) ;
 # (2) Board Information
 
 UPLOAD_PROTOCOL ?= arduino ;
-UPLOAD_SPEED 	?= 57600 ;
+UPLOAD_SPEED 	?= 115200 ;
 MCU		?= atmega328p ;
 F_CPU 		?= 16000000 ;
 CORE		?= arduino ;
diff --git a/tests/pingpair_test/Jamfile b/tests/pingpair_test/Jamfile
index 6268f4b..18244ec 100644
--- a/tests/pingpair_test/Jamfile
+++ b/tests/pingpair_test/Jamfile
@@ -6,7 +6,7 @@ PROJECT_DIRS	= $(PWD) ;
 # (2) Board Information
 
 UPLOAD_PROTOCOL ?= arduino ;
-UPLOAD_SPEED 	?= 57600 ;
+UPLOAD_SPEED 	?= 115200 ;
 MCU		?= atmega328p ;
 F_CPU 		?= 16000000 ;
 CORE		?= arduino ;
diff --git a/tests/pingpair_test/runtests.sh b/tests/pingpair_test/runtests.sh
index 3416f86..9f1a73f 100755
--- a/tests/pingpair_test/runtests.sh
+++ b/tests/pingpair_test/runtests.sh
@@ -4,9 +4,13 @@
 # WARNING: Test config 2 only works with PLUS units.
 
 jam u0 u1 && expect test.ex 1
-stty 57600 raw ignbrk hup < /dev/ttyUSB0 && sleep 1
-stty 57600 raw ignbrk hup < /dev/ttyUSB1 && sleep 1
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB0
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB1
 expect test.ex 2
-stty 57600 raw ignbrk hup < /dev/ttyUSB0 && sleep 1
-stty 57600 raw ignbrk hup < /dev/ttyUSB1 && sleep 1
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB0
+sleep 1
+stty 57600 raw ignbrk hup < /dev/ttyUSB1
 expect test.ex 3