diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9386aa16..23dbe866 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,16 +36,18 @@ jobs:
       - name: Test on Unix
         if: runner.os != 'Windows'
         run: |
+          unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
+          openicf/bin/ConnectorServer.sh
           if [ "$RUNNER_OS" == "Linux" ]; then
               sudo apt-get install jsvc
+              openicf/bin/openicf.sh start
+              timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/openicf.err ; do sleep 5; done' || cat openicf/logs/*
+              ! grep " ERROR " openicf/logs/ConnectorServer.log
+              openicf/bin/openicf.sh stop
+              rm -rf openicf/logs/*
           else
               brew install coreutils jsvc 
           fi
-          unzip OpenICF-java-framework/openicf-zip/target/openicf-*.zip
-          openicf/bin/ConnectorServer.sh
-          openicf/bin/openicf.sh start
-          openicf/bin/openicf.sh stop
-          rm -rf openicf/logs
           openicf/bin/ConnectorServer.sh /run &
           timeout 2m bash -c 'until grep -q "ConnectorServer listening on" openicf/logs/ConnectorServer.log ; do sleep 5; done'
           ! grep " ERROR " openicf/logs/ConnectorServer.log
diff --git a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
index fd3c6449..61f493c9 100644
--- a/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
+++ b/OpenICF-java-framework/openicf-zip/src/main/resources/bin/openicf.sh
@@ -89,7 +89,7 @@ case "$1" in
     start)
         echo "Starting the $DESC..."
         # Start the service
-        jsvc_exec
+        jsvc_exec "-wait 120"
 
         echo "The $DESC has started. pid=$(cat $PID)"
     ;;
@@ -110,7 +110,7 @@ case "$1" in
             jsvc_exec "-stop"
 
             # Start the service
-            jsvc_exec
+            jsvc_exec "-wait 120"
 
             echo "The $DESC has restarted. pid=$(cat $PID)"
         else