diff --git a/.github/workflows/test-tempdb.yml b/.github/workflows/test-tempdb.yml
new file mode 100644
index 0000000000..33b41e06a7
--- /dev/null
+++ b/.github/workflows/test-tempdb.yml
@@ -0,0 +1,93 @@
+name: Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test-tempdb-windows:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+        
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            3.1
+            6.x
+            7.x
+      
+      - name: Setup NodeJS
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '18'
+          
+      - name: Build and test
+        env:
+          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+          SUPPRESS_DOWNLOAD_PROGRESS: 1
+        run: |
+          npm i
+          npm run test-tempdb
+          
+  test-tempdb-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v2
+        
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            3.1
+            6.x
+            7.x
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '18'
+
+      - name: Build and test
+        env:
+          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+          SUPPRESS_DOWNLOAD_PROGRESS: 1
+        run: |
+          npm i
+          npm run test-tempdb
+    
+  test-tempdb-osx:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v3
+        
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: |
+            3.1
+            6.x
+            7.x
+
+      - name: Setup NodeJS
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '18'
+
+      - name: Build and test
+        env:
+          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+          SUPPRESS_DOWNLOAD_PROGRESS: 1
+        run: |
+          npm i
+          npm run test-tempdb
+    
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 645b9043d3..93263b159c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,17 +10,22 @@ jobs:
   test-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup .NET Core 3
-        uses: actions/setup-dotnet@v1
+      - name: Checkout project
+        uses: actions/checkout@v2
+        
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
             3.1
             6.x
             7.x
-      - uses: actions/setup-node@v2-beta
+      
+      - name: Setup NodeJS
+        uses: actions/setup-node@v2-beta
         with:
           node-version: '18'
+          
       - name: Build and test
         env:
           DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
@@ -29,11 +34,13 @@ jobs:
         run: |
           npm i
           npm run test-windows
-      - uses: actions/upload-artifact@v2
+          
+      - name: Upload build reports    
+        uses: actions/upload-artifact@v2
         with:
           name: build-reports
           path: buildreports/
-    
+          
   test-linux:
     # disabled, for now, because it hangs
     if: false
diff --git a/package.json b/package.json
index 52512b66ea..c4e5d71b3b 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,11 @@
   "license": "BSD-3-Clause",
   "scripts": {
     "test": "cross-env DOTNET_CORE=1 TEST_ADDITIONAL_EXCLUDE=PeanutButter.WindowsServiceManagement.Core.Tests zarro test-dotnet",
+    "test-tempdb": "cross-env DOTNET_CORE=1 TEST_INCLUDE=PeanutButter.TempDb.MySql.Data.Tests,PeanutButter.TempDb.MySql.Connector.Tests,PeanutButter.TempDb.Tests,PeanutButter.TempDb.Runner.Tests zarro test-dotnet",
     "test-windows": "cross-env TEST_ADDITIONAL_EXCLUDE=PeanutButter.WindowsServiceManagement.Core.Tests,PeanutButter.WindowsServiceManagement.Tests zarro test-dotnet",
-    "test-ini": "cross-env DOTNET_CORE=1 TEST_INCLUDE=PeanutButter.INI.Tests zarro test",
+    "test-ini": "cross-env DOTNET_CORE=1 TEST_INCLUDE=PeanutButter.INI.Tests zarro test-dotnet",
     "test-fx": "cross-env DOTNET_CORE=0 zarro test-dotnet",
     "test-not-tempdb": "cross-env DOTNET_CORE=1 TEST_ADDITIONAL_EXCLUDE=source/TempDb/**/* zarro test-dotnet",
-    "test-tempdb": "cross-env DOTNET_TEST_PARALLEL=0 DOTNET_CORE=1 TEST_INCLUDE=source/TempDb/**/*Tests* zarro test-dotnet",
-    "test-tempdb-mysql-data": "cross-env DOTNET_CORE=1 TEST_INCLUDE=**/PeanutButter.TempDb.MySql.Data.Tests* zarro test-dotnet",
     "build-with-msbuild": "cross-env DOTNET_CORE=0 zarro build",
     "cover": "zarro cover-dotnet",
     "postcover": "run-s generate-reports",
diff --git a/source/PeanutButter.sln b/source/PeanutButter.sln
index 5d70665e9d..1320471984 100644
--- a/source/PeanutButter.sln
+++ b/source/PeanutButter.sln
@@ -186,6 +186,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{3036AFBD-41FC-401F-9A7B-A5D61E688823}"
 	ProjectSection(SolutionItems) = preProject
 		..\.github\workflows\test.yml = ..\.github\workflows\test.yml
+		..\.github\workflows\test-tempdb.yml = ..\.github\workflows\test-tempdb.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{905D8BA4-13FC-4FE2-8290-9263E0180961}"