diff --git a/.gitignore b/.gitignore
index 327bb62..d345037 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@ retropikzel/pffi/*/*.so
 retropikzel/pffi/*/compiled
 tmp
 dockerfiles/build
-scheme_testrunner
+.scheme_testrunner
diff --git a/.scheme_testrunner/Dockerfile.debian-trixie-amd64 b/.scheme_testrunner/Dockerfile.debian-trixie-amd64
deleted file mode 100644
index 10e0e33..0000000
--- a/.scheme_testrunner/Dockerfile.debian-trixie-amd64
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM debian:trixie
-WORKDIR /workdir
-RUN mkdir -p /workdir/.scheme_testrunner
-COPY .scheme_testrunner/ /workdir/.scheme_testrunner
-RUN bash .scheme_testrunner/init
-RUN bash .scheme_testrunner/implementation_installer.sh
-ENTRYPOINT ["bash", "-c", "bash test-guile.sh"]
diff --git a/.scheme_testrunner/implementation_installer.sh b/.scheme_testrunner/implementation_installer.sh
index 0422d2e..29287f5 100644
--- a/.scheme_testrunner/implementation_installer.sh
+++ b/.scheme_testrunner/implementation_installer.sh
@@ -1,4 +1,11 @@
-#!/bin/sh
-
-apt update
-apt install -y guile-3.0
+RUN apk add --no-cache --update wine 7zip
+RUN apt install -y wine64 7zip || true
+RUN dnf install -y wine64 7zip || true
+RUN unset DISPLAY && wine hostname
+RUN wget https://download.racket-lang.org/installers/8.13/racket-8.13-x86_64-win32-cs.exe
+ENV WINEDEBUG=-all
+RUN wine racket-8.13-x86_64-win32-cs.exe /exenoui /qn /norestart
+#RUN 7z e racket-8.13-x86_64-win32-cs.exe -y
+#RUN apk add mlocate && updatedb && locate racket.exe
+#ENV WINEPATH=/racket/bin
+#RUN tree /racket
diff --git a/.scheme_testrunner/init b/.scheme_testrunner/init
index 9b61ab2..500174f 100644
--- a/.scheme_testrunner/init
+++ b/.scheme_testrunner/init
@@ -1,6 +1,6 @@
-#!/bin/sh
-
-apt update && apt install -y make build-essential curl wget
-wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
-bash guix-install.sh -y
-echo "Hello from init container"
+RUN apk add build-base wget bash curl make cmake || true
+RUN apt update && apt install -y make cmake build-essential curl wget bash || true
+RUN dnf group install "Development Tools" -y || true
+RUN dnf install -y curl wget bash make cmake || true
+RUN zypper install -t pattern devel_basis || true
+RUN zypper install -y curl wget bash make cmake findutils || true
diff --git a/.scheme_testrunner/init_container.sh b/.scheme_testrunner/init_container.sh
deleted file mode 100644
index f38a93d..0000000
--- a/.scheme_testrunner/init_container.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "Hello from init container"
diff --git a/Makefile b/Makefile
index 0d5edd5..10a6d49 100644
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,22 @@ test: build
 	bash test-all.sh
 
 test-arm64:
-	scheme_testrunner debian:trixie arm64 guile "test-guile.sh"
-	scheme_testrunner debian:trixie arm64 kawa "test-kawa.sh"
-	#scheme_testrunner fedora_40 arm64 "bash test-all.sh"
+	scheme_testrunner alpine:3.20 arm64 guile "bash test-guile.sh"
+	scheme_testrunner alpine:3.20 arm64 sagittarius "bash test-sagittarius.sh"
+	#
+	scheme_testrunner debian:trixie arm64 guile "bash test-guile.sh"
+	scheme_testrunner debian:trixie arm64 sagittarius "bash test-sagittarius.sh"
+	#
+	scheme_testrunner fedora:40 arm64 guile "bash test-guile.sh"
+	scheme_testrunner fedora:40 arm64 sagittarius "bash test-sagittarius.sh"
+	#
+	scheme_testrunner opensuse/tumbleweed arm64 guile "bash test-guile.sh"
+	scheme_testrunner opensuse/tumbleweed arm64 sagittarius "bash test-sagittarius.sh"
+
+test-amd64-wine:
+	#scheme_testrunner alpine:3.20 amd64 sagittarius_wine "bash test-sagittarius-wine.sh"
+	scheme_testrunner alpine:3.20 amd64 racket_wine "bash test-racket-wine.sh"
+
 
 clean:
 	rm -rf docutmp
diff --git a/test-all.sh b/test-all.sh
deleted file mode 100644
index 320a7c3..0000000
--- a/test-all.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-set -o pipefail
-
-VERSION=$(cat VERSION)
-
-for testfile in ./test-*.sh
-do
-    if [[ ! "${testfile}" = "./test-all.sh" ]];
-    then
-        bash "${testfile}"
-    fi
-done
diff --git a/in-progress-test-cyclone.sh b/test-cyclone.sh
similarity index 100%
rename from in-progress-test-cyclone.sh
rename to test-cyclone.sh
diff --git a/in-progress-test-gambit.sh b/test-gamit.sh
similarity index 100%
rename from in-progress-test-gambit.sh
rename to test-gamit.sh
diff --git a/in-progress-test-gerbil.sh b/test-gerbil.sh
similarity index 100%
rename from in-progress-test-gerbil.sh
rename to test-gerbil.sh
diff --git a/test-racket-wine.sh b/test-racket-wine.sh
new file mode 100644
index 0000000..5775876
--- /dev/null
+++ b/test-racket-wine.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+source scripts/init-test.sh
+
+SCHEME="racket.exe -I r7rs --make -S . --script"
+
+source scripts/test-runs-dynamic.sh
diff --git a/test-sagittarius-container-wine.sh b/test-sagittarius-wine.sh
similarity index 68%
rename from test-sagittarius-container-wine.sh
rename to test-sagittarius-wine.sh
index 4c4ae0b..d45dce4 100644
--- a/test-sagittarius-container-wine.sh
+++ b/test-sagittarius-wine.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 source scripts/init-test.sh
 
-SCHEME="wine /app/sash.exe -c -r7 -L ."
+SCHEME="wine sash.exe -c -r7 -L ."
 
 source scripts/test-runs-dynamic.sh
diff --git a/in-progress-stklos.sh b/test-stklos.sh
similarity index 100%
rename from in-progress-stklos.sh
rename to test-stklos.sh