diff --git a/.github/workflows/gitwatch.yml b/.github/workflows/gitwatch.yml
index 4ec431e..5bab280 100644
--- a/.github/workflows/gitwatch.yml
+++ b/.github/workflows/gitwatch.yml
@@ -82,8 +82,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Setup upterm session
-        uses: lhotari/action-upterm@v1
+      # - name: Setup upterm session
+      #   uses: lhotari/action-upterm@v1
 
       - name: Run tests
         shell: bash
diff --git a/othertests/startup-shutdown.bash b/othertests/startup-shutdown.bash
index 2557f89..db3435d 100755
--- a/othertests/startup-shutdown.bash
+++ b/othertests/startup-shutdown.bash
@@ -29,10 +29,10 @@ teardown() {
 
   echo "Process id again $GITWATCH_PID" >&3
   # Make sure gitwatch script gets killed if script stopped background
+  # Also make sure to kill fswatch if on Mac
+  killall fswatch
   # Must kill the entire tree of processes generated
   pkill -15 -P "$GITWATCH_PID"
-  # Also make sure to kill fswatch if on Mac
-  killall -9 fswatch
 
   echo '# Teardown complete' >&3
 }