diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 0c4dacc..81cd673 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -26,7 +26,7 @@ echo "Shutting down currently-running server..."
 
 for socket in unix tcp; do
 	# allow some time for server to shutdown
-	sleep 1s;
+	sleep 0.5s;
 
 	echo "Running tests for $socket sockets"
 
@@ -34,6 +34,9 @@ for socket in unix tcp; do
 	echo "Starting server..."
 	startServer
 
+	# make sure the server is up and running
+	sleep 0.5s
+
 	# Run tests
 	for testCase in tc*; do
 		cd $testCase