diff --git a/.github/workflows/ci-Client.yml b/.github/workflows/ci-Client.yml
index 01ae4217..fc5bb21e 100644
--- a/.github/workflows/ci-Client.yml
+++ b/.github/workflows/ci-Client.yml
@@ -91,12 +91,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.workflow_dispatch.ref }}
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
       - name: Run tests
         id: test_run
         if: steps.last_run_status.outputs.last_run_status != 'success'
         run: |
           export GS_HOME="$(pwd)"
-          export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
+          export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
           export GS_TRAVIS=true
           export JAVA="/usr/bin/java"
           hostname
diff --git a/.github/workflows/ci-Seaside3.yml b/.github/workflows/ci-Seaside3.yml
index f80a7f73..b18dc24a 100644
--- a/.github/workflows/ci-Seaside3.yml
+++ b/.github/workflows/ci-Seaside3.yml
@@ -46,12 +46,15 @@ jobs:
       - name: Install Chrome
         run: |
           sudo apt install google-chrome-stable
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
       - name: Run tests
         id: test_run
         if: steps.last_run_status.outputs.last_run_status != 'success'
         run: |
           export GS_HOME="$(pwd)"
-          export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
+          export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
           export GS_TRAVIS=true
           export JAVA="/usr/bin/java"
           export CHROME_DRIVER_VERSION="90.0.4430.24"
diff --git a/.github/workflows/ci-SmalltalkCI.yml b/.github/workflows/ci-SmalltalkCI.yml
index 5ab3773a..fbff0724 100644
--- a/.github/workflows/ci-SmalltalkCI.yml
+++ b/.github/workflows/ci-SmalltalkCI.yml
@@ -50,12 +50,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.workflow_dispatch.ref }}
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
       - name: Run tests
         id: test_run
         if: steps.last_run_status.outputs.last_run_status != 'success'
         run: |
           export GS_HOME="$(pwd)"
-          export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
+          export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
           export GS_TRAVIS=true
           hostname
           cat /etc/hosts
diff --git a/.github/workflows/ci-UpgradeTests.yml b/.github/workflows/ci-UpgradeTests.yml
index 597a5c42..20272fb5 100644
--- a/.github/workflows/ci-UpgradeTests.yml
+++ b/.github/workflows/ci-UpgradeTests.yml
@@ -100,12 +100,15 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.workflow_dispatch.ref }}
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
       - name: Run tests
         id: test_run
         if: steps.last_run_status.outputs.last_run_status != 'success'
         run: |
           export GS_HOME="$(pwd)"
-          export PATH="$GS_HOME/superdoit_devkit/bin":"$GS_HOME/superdoit_devkit/examples":"$GS_HOME/superdoit_devkit/utils":"$GS_HOME/superdoit_devkit/tests":"$GS_HOME/bin":$PATH
+          export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
           export GS_TRAVIS=true
           hostname
           cat /etc/hosts
diff --git a/bin/defHOME_PATH.env b/bin/defHOME_PATH.env
index fc3669dd..ef177225 100644
--- a/bin/defHOME_PATH.env
+++ b/bin/defHOME_PATH.env
@@ -8,5 +8,5 @@ pushd "$( dirname "${BASH_SOURCE[0]}" )" >& /dev/null
 	export GS_HOME=`pwd`
 popd >& /dev/null
 # put tests in the path for the near term ... remove before general release
-export PATH="$GS_HOME/bin":$PATH
+export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
 
diff --git a/bin/defSUPERDOIT_PATH.env b/bin/defSUPERDOIT_PATH.env
deleted file mode 100644
index ef177225..00000000
--- a/bin/defSUPERDOIT_PATH.env
+++ /dev/null
@@ -1,12 +0,0 @@
-#=========================================================================
-# Copyright (c) 2015 GemTalk Systems, LLC <dhenrich@gemtalksystems.com>.
-#
-#=========================================================================
-
-pushd "$( dirname "${BASH_SOURCE[0]}" )" >& /dev/null
-	cd ..
-	export GS_HOME=`pwd`
-popd >& /dev/null
-# put tests in the path for the near term ... remove before general release
-export PATH="$GS_HOME/shared/gemstone/bin":"$GS_HOME/shared/gemstone/repos/superDoit/bin":"$GS_HOME/bin":$PATH
-
diff --git a/bin/installSuperDoit.sh b/bin/installSuperDoit.sh
new file mode 100755
index 00000000..fdbe411a
--- /dev/null
+++ b/bin/installSuperDoit.sh
@@ -0,0 +1,55 @@
+i#! /usr/bin/env bash
+#=========================================================================
+# Copyright (c) 2015, 2016 GemTalk Systems, LLC <dhenrich@gemtalksystems.com>.
+#
+#   MIT license: https://github.com/GsDevKit/GsDevKit_home/blob/master/license.txt
+#=========================================================================
+
+theArgs="$*"
+source "${GS_HOME}/bin/private/shFeedback"
+start_banner
+
+usage() {
+  cat <<HELP
+USAGE: $(basename $0)
+
+DESCRIPTION
+   Install https://github.com/dalehenrich/superDoit in support of .solo and stone scripts 
+
+EXAMPLES
+   $(basename $0) -h
+   $(basename $0) 
+
+HELP
+}
+
+if [ "${GS_HOME}x" = "x" ] ; then
+  exit_1_banner "the GS_HOME environment variable needs to be defined"
+fi
+source "${GS_HOME}/bin/defGsDevKit.env"
+
+while getopts "hc:o:" OPT ; do
+  case "$OPT" in
+    *) usage; exit_1_banner "Unknown option";;
+  esac
+done
+shift $(($OPTIND - 1))
+
+if [ $# -ne 1 ]; then
+  usage; exit_1_banner "Wrong number of arguments (0 expected)"
+fi
+
+if [ ! -d "$GS_HOME/shared/gemstone/repos/superDoit" ] ; then
+	pushd $GS_HOME/shared/gemstone/repos
+		$GS_HOME/bin/downloadGemStone 3.6.1
+		$GS_HOME/bin/private/cloneGitHubProject -c https dalehenrich superDoit
+		cd superDoit/gemstone/gs
+		curl  -L -O -s -S "https://github.com/dalehenrich/superDoit/releases/download/v0.1.0/3.6.1_extent0.solo.dbf.gz"
+		gunzip --stdout 3.6.1_extent0.solo.dbf.gz > extent0.solo.dbf
+		chmod -w extent0.solo.dbf
+		ln -s $GS_HOME/shared/downloads/products/GemStone64Bit3.6.1-* product
+	popd
+fi
+
+exit_0_banner "...finished"
+
diff --git a/bin/setupGsDevKit b/bin/setupGsDevKit
index 69064589..2405a80a 100755
--- a/bin/setupGsDevKit
+++ b/bin/setupGsDevKit
@@ -59,15 +59,7 @@ setupType=$1
 "$GS_HOME/bin/utils/cloneGsDevKitProjects" $modeArg $organizationArg $setupType
 "$GS_HOME/bin/utils/cloneSharedTodeProjects" $modeArg $setupType
 
-pushd $GS_HOME/shared/gemstone/repos
-	$GS_HOME/bin/downloadGemStone 3.6.1
-	$GS_HOME/bin/private/cloneGitHubProject -c https dalehenrich superDoit
-	cd superDoit/gemstone/gs
-	curl  -L -O -s -S "https://github.com/dalehenrich/superDoit/releases/download/v0.1.0/3.6.1_extent0.solo.dbf.gz"
-	gunzip --stdout 3.6.1_extent0.solo.dbf.gz > extent0.solo.dbf
-	chmod -w extent0.solo.dbf
-	ln -s $GS_HOME/shared/downloads/products/GemStone64Bit3.6.1-* product
-popd
+"$$GS_HOME/bin/installSuperDoit.sh"
 
 cat - > "$GS_HOME/bin/.gsdevkitSetup" << EOF
 the presence of this file means that \$GS_HOME/bin/setupGsDevKit has
diff --git a/tests/testTravisCI.sh b/tests/testTravisCI.sh
index 814f6bfa..fed2220a 100755
--- a/tests/testTravisCI.sh
+++ b/tests/testTravisCI.sh
@@ -30,9 +30,6 @@ $GS_HOME/bin/private/clone_sys_local -c https
 # Customize the scripts used by tODE (https://github.com/dalehenrich/tode/issues/226)
 $GS_HOME/tests/travisCustomize.sh
 
-## Prepare superdoit scripts
-#$GS_HOME/tests/prepare_tests_superdoit.sh
-
 if [ "${DOWNLOAD}x" != "x" ] ; then
   downloadGemStone -f -d "${DOWNLOAD}" $GS_VERSION
 fi