diff --git a/.travis.yml b/.travis.yml
index b59f6cae24..2aef3da046 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,97 +28,98 @@ jobs:
   fast_finish: true
   include:
   - stage: "Main Squeak and Pharo builds"
-    env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
-  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
+    env: ARCH="linux32x86"    FLAVOR="squeak.cog.spur"          TESTIMAGE="Squeak32-5.1"
+  - env: ARCH="macos32x86"    FLAVOR="squeak.cog.spur"          TESTIMAGE="Squeak32-5.1"
     <<: *mac-build
-  - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
-  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
+  - env: ARCH="linux64x64"    FLAVOR="squeak.cog.spur"          TESTIMAGE="skip"
+  - env: ARCH="macos64x64"    FLAVOR="squeak.cog.spur"          TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
+  - env: ARCH="linux32x86"    FLAVOR="pharo.cog.spur"           TESTIMAGE="Pharo32-5.0"   HEARTBEAT="threaded"
+  - env: ARCH="macos32x86"    FLAVOR="pharo.cog.spur"           TESTIMAGE="Pharo32-5.0"
     <<: *mac-build
-  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
+  - env: ARCH="linux64x64"    FLAVOR="pharo.cog.spur"           TESTIMAGE="skip"          HEARTBEAT="threaded" 
+  - env: ARCH="macos64x64"    FLAVOR="pharo.cog.spur"           TESTIMAGE="skip"
     <<: *mac-build
 
   - stage: "Other Linux builds"
-    env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
-  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-  # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
-  - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
-  - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
-  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
+    env: ARCH="linux64x64"    FLAVOR="newspeak.cog.spur"        TESTIMAGE="skip"
+  - env: ARCH="linux64x64"    FLAVOR="pharo.cog.spur"           TESTIMAGE="skip"          HEARTBEAT="itimer"
+  #-env: ARCH="linux64x64"    FLAVOR="pharo.sista.spur"         TESTIMAGE="skip"          HEARTBEAT="threaded"
+  - env: ARCH="linux32x86"    FLAVOR="newspeak.cog.spur"        TESTIMAGE="refer newspeakBootstrap.sh"
+  - env: ARCH="linux32x86"    FLAVOR="squeak.cog.v3"            TESTIMAGE="Squeak32-4.6"
+  - env: ARCH="linux32x86"    FLAVOR="squeak.sista.spur"        TESTIMAGE="skip"
+  - env: ARCH="linux32x86"    FLAVOR="pharo.cog.spur"           TESTIMAGE="Pharo32-5.0"   HEARTBEAT="itimer"
+  - env: ARCH="linux32x86"    FLAVOR="pharo.sista.spur"         TESTIMAGE="skip"          HEARTBEAT="threaded"
     compiler: clang
-  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer" 
+  - env: ARCH="linux32x86"    FLAVOR="pharo.sista.spur"         TESTIMAGE="skip"          HEARTBEAT="itimer" 
     compiler: clang
 
   - stage: "Other Mac builds"
-    env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
+    env: ARCH="macos64x64"    FLAVOR="newspeak.cog.spur"        TESTIMAGE="refer newspeakBootstrap.sh"
     <<: *mac-build
-  # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
+  #-env: ARCH="macos64x64"    FLAVOR="pharo.sista.spur"         TESTIMAGE="skip"
   #   <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
+  - env: ARCH="macos64x64"    FLAVOR="pharo.cog.spur.lowcode"   TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
+  - env: ARCH="macos32x86"    FLAVOR="newspeak.cog.spur"        TESTIMAGE="refer newspeakBootstrap.sh"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
+  - env: ARCH="macos32x86"    FLAVOR="pharo.sista.spur"         TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
+  - env: ARCH="macos32x86"    FLAVOR="pharo.cog.spur.lowcode"   TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
+  - env: ARCH="macos32x86"    FLAVOR="squeak.cog.v3"            TESTIMAGE="Squeak32-4.6"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
+  - env: ARCH="macos32x86"    FLAVOR="squeak.sista.spur"        TESTIMAGE="skip"
     <<: *mac-build
 
   - stage: "Stack builds"
-    env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
-  - env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
-  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
+    env: ARCH="linux64x64"    FLAVOR="newspeak.stack.spur"      TESTIMAGE="refer newspeakBootstrap.sh"
+  - env: ARCH="linux64x64"    FLAVOR="squeak.stack.spur"        TESTIMAGE="skip"
+  - env: ARCH="linux32x86"    FLAVOR="newspeak.stack.spur"      TESTIMAGE="refer newspeakBootstrap.sh"
+  - env: ARCH="linux32x86"    FLAVOR="squeak.stack.spur"        TESTIMAGE="Squeak32-5.1"
+  - env: ARCH="linux32x86"    FLAVOR="squeak.stack.v3"          TESTIMAGE="Squeak32-4.6"
+  - env: ARCH="macos64x64"    FLAVOR="pharo.stack.spur"         TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
+  - env: ARCH="macos64x64"    FLAVOR="pharo.stack.spur.lowcode" TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
+  - env: ARCH="macos64x64"    FLAVOR="squeak.stack.spur"        TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
+  - env: ARCH="macos32x86"    FLAVOR="newspeak.stack.spur"      TESTIMAGE="refer newspeakBootstrap.sh"
     <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
+  - env: ARCH="macos64x64"    FLAVOR="newspeak.stack.spur"      TESTIMAGE="refer newspeakBootstrap.sh"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
+  - env: ARCH="macos32x86"    FLAVOR="pharo.stack.spur"         TESTIMAGE="Pharo32-5.0"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
+  - env: ARCH="macos32x86"    FLAVOR="pharo.stack.spur.lowcode" TESTIMAGE="skip"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
+  - env: ARCH="macos32x86"    FLAVOR="squeak.stack.spur"        TESTIMAGE="Squeak32-5.1"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
+  - env: ARCH="macos32x86"    FLAVOR="squeak.stack.v3"          TESTIMAGE="Squeak32-4.6"
     <<: *mac-build
 
+# Don't run tests on ARM (ARM builds already take a long time)
   - stage: "linux32ARMv6 builds"
-    env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
+    env: ARCH="linux32ARMv6"  FLAVOR="newspeak.cog.spur"        TESTIMAGE="skip"          CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
+  - env: ARCH="linux32ARMv6"  FLAVOR="newspeak.stack.spur"      TESTIMAGE="skip"          CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6"  FLAVOR="squeak.cog.spur"          TESTIMAGE="skip"          CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6"  FLAVOR="pharo.cog.spur"           TESTIMAGE="skip"          CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
+  - env: ARCH="linux32ARMv6"  FLAVOR="squeak.stack.spur"        TESTIMAGE="skip"          CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6"  FLAVOR="squeak.stack.v3"          TESTIMAGE="skip"          CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
diff --git a/scripts/ci/travis_test.sh b/scripts/ci/travis_test.sh
index fa816e5d31..738068c13d 100755
--- a/scripts/ci/travis_test.sh
+++ b/scripts/ci/travis_test.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 set -e
 
-# Don't run tests on ARM (ARM builds already take a long time)
-[[ "${ARCH}" == *"ARM"* ]] && exit 0
+if [[ "${TESTIMAGE}" = "skip" ]]; then
+  echo "Skipping SUnit testing!"
+  exit 0
+fi
 
 case "${FLAVOR}" in
   "squeak"*|"pharo"*)
diff --git a/tests/smalltalkCI.sh b/tests/smalltalkCI.sh
index 565158ac58..99c1159569 100755
--- a/tests/smalltalkCI.sh
+++ b/tests/smalltalkCI.sh
@@ -3,37 +3,22 @@ set -e
 
 readonly STON_CONFIG="${TRAVIS_BUILD_DIR}/tests/smalltalk.ston"
 
-if [[ "${ARCH}" = *"64x64" ]]; then
-  echo "Skipping SUnit testing on ${ARCH}..."
-  exit 0
-fi
-
-if [[ "${FLAVOR}" = *"sista"* ]]; then
-  echo "Skipping SUnit testing in Sista builds..."
-  exit 0
+if [[ "${TESTIMAGE}" = "" ]]; then
+  echo "Error: TESTIMAGE is not defined!"
+  exit 1
 fi
 
 case "${FLAVOR}" in
   "squeak"*)
-    if [[ "${FLAVOR}" = *".spur" ]]; then
-      SMALLTALK_VERSION="Squeak-5.1"
-    else
-      SMALLTALK_VERSION="Squeak-4.6"
-    fi
     LINUX_BINARY="squeak"
     MACOS_BINARY="Squeak"
     ;;
   "Xpharo"*) # disabled until pharo-vm is merged
-    if [[ "${FLAVOR}" = *".spur" ]]; then
-      SMALLTALK_VERSION="Pharo-5.0"
-    else
-      SMALLTALK_VERSION="Pharo-5.0"
-    fi
     LINUX_BINARY="pharo"
     MACOS_BINARY="Pharo"
     ;;
   *)
-    echo "Skipping SUnit testing for ${FLAVOR}..."
+    echo "Skipping SUnit testing for unknown flavor ${FLAVOR}..."
     exit 0
     ;;
 esac
@@ -62,6 +47,6 @@ unzip -q -o smalltalkCI.zip
 
 pushd smalltalkCI-* > /dev/null
 
-"./run.sh" -s "${SMALLTALK_VERSION}" --vm "${VM}" "${STON_CONFIG}"
+"./run.sh" -s "${TESTIMAGE}" --vm "${VM}"  "${STON_CONFIG}"
 
 popd > /dev/null