diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index adc2764..0bd6dc2 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -29,6 +29,18 @@ jobs:
             ~/.clojure
             ~/.cpcache
           key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
+      - name: Setup Databases
+        run: docker-compose up -d
+        env:
+          MYSQL_ROOT_PASSWORD: testing
+      - name: Create ClojureTest
+        run: ./run-tests.sh create
+        env:
+          MYSQL_ROOT_PASSWORD: testing
+      - name: Run All Tests
+        run: ./run-tests.sh
+        env:
+          MYSQL_ROOT_PASSWORD: testing
       - name: Run Tests
         run: clojure -T:build ci :snapshot false
       - name: Deploy Release
diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml
index e64bbc6..51be417 100644
--- a/.github/workflows/test-and-snapshot.yml
+++ b/.github/workflows/test-and-snapshot.yml
@@ -27,6 +27,18 @@ jobs:
             ~/.clojure
             ~/.cpcache
           key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
+      - name: Setup Databases
+        run: docker-compose up -d
+        env:
+          MYSQL_ROOT_PASSWORD: testing
+      - name: Create ClojureTest
+        run: ./run-tests.sh create
+        env:
+          MYSQL_ROOT_PASSWORD: testing
+      - name: Run All Tests
+        run: ./run-tests.sh
+        env:
+          MYSQL_ROOT_PASSWORD: testing
       - name: Run Tests
         run: clojure -T:build ci :snapshot true
       - name: Deploy Snapshot
@@ -62,35 +74,6 @@ jobs:
       - name: Run Tests
         run: clojure -T:build test
 
-  build-graalvm-old:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '19.3.6', '20.3.2' ]
-        base: [ 'java8', 'java11' ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          tools-deps: '1.10.3.1053'
-      - name: Cache All The Things
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
-
   build-graalvm-new:
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eceec65..1622ff0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,15 +2,12 @@ name: Pull Request
 
 on: [pull_request]
 
-services:
-  - docker
-
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8', '11', '14', '15', '16', '17' ]
+        java: [ '8', '11', '14', '17', '18' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
@@ -40,35 +37,8 @@ jobs:
           MYSQL_ROOT_PASSWORD: testing
       - name: Run Tests
         run: ./run-tests.sh
-
-  build-graalvm-old:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        graalvm: [ '19.3.6', '20.3.2' ]
-        base: [ 'java8', 'java11' ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@5.0
-        with:
-          graalvm: ${{ matrix.graalvm }}
-          java: ${{ matrix.base }}
-      - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@master
-        with:
-          tools-deps: '1.10.3.1053'
-      - name: Cache All The Things
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-            ~/.clojure
-            ~/.cpcache
-          key: ${{ runner.os }}-${{ hashFiles('**/deps.edn') }}
-      - name: Run Tests
-        run: clojure -T:build test
+        env:
+          MYSQL_ROOT_PASSWORD: testing
 
   build-graalvm-new:
     runs-on: ubuntu-latest
diff --git a/run-tests.sh b/run-tests.sh
index ed93d36..b9e4892 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -12,6 +12,7 @@
 
 if test "$1" = "create"
 then
+  sleep 30
 	# assumes you already have a MySQL instance running locally
 	NEXT_JDBC_TEST_MYSQL=yes clojure -X:test next.jdbc.test-fixtures/create-clojure-test
 fi
@@ -25,3 +26,4 @@ then
 	NEXT_JDBC_TEST_MSSQL=yes MSSQL_SA_PASSWORD=Str0ngP4ssw0rd \
 		NEXT_JDBC_TEST_MYSQL=yes clojure -X:test
 fi
+exit $?