diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 7ad19aa..b7fa567 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -10,20 +10,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 jobs:
-  test:
-    name: "Tests"
-    strategy:
-      fail-fast: false
-      matrix:
-        group:
-          - MOL
-          - NeuralPDE
-        version:
-          - 'lts'
-          - '1'
-          - 'pre'
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
+  tests:
+    uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1"
     with:
-      julia-version: "${{ matrix.version }}"
-      group: "${{ matrix.group }}"
+      coverage-directories: "src"
     secrets: "inherit"
diff --git a/Project.toml b/Project.toml
index c7d44e9..61b1bdc 100644
--- a/Project.toml
+++ b/Project.toml
@@ -16,11 +16,18 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 [compat]
 DomainSets = "0.6, 0.7"
 Interpolations = "0.14, 0.15, 0.16"
+Lux = "1"
 Markdown = "1"
+MethodOfLines = "0.11, 0.12"
 ModelingToolkit = "9.7.1, 10, 11"
+NonlinearSolve = "3, 4"
+OptimizationOptimJL = "0.3, 0.4"
 OrdinaryDiffEq = "6.80.0, 7"
 OrdinaryDiffEqSDIRK = "1.2.0, 2"
+SafeTestsets = "0.1"
 SciMLBase = "2.69.0, 3.1"
+SciMLTesting = "1"
+Test = "1"
 julia = "1.10"
 
 [extras]
@@ -29,7 +36,8 @@ MethodOfLines = "94925ecb-adb7-4558-8ed8-f975c56a0bf4"
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "MethodOfLines", "Lux", "NonlinearSolve", "OptimizationOptimJL", "SafeTestsets"]
+test = ["Test", "MethodOfLines", "Lux", "NonlinearSolve", "OptimizationOptimJL", "SafeTestsets", "SciMLTesting"]
diff --git a/test/neuralpde_test.jl b/test/extras/neuralpde_test.jl
similarity index 100%
rename from test/neuralpde_test.jl
rename to test/extras/neuralpde_test.jl
diff --git a/test/qa/Project.toml b/test/qa/Project.toml
new file mode 100644
index 0000000..8d42226
--- /dev/null
+++ b/test/qa/Project.toml
@@ -0,0 +1,15 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+PDESystemLibrary = "d14f9848-fe58-4297-bd22-c1aba6f3000d"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[sources]
+PDESystemLibrary = {path = "../.."}
+
+[compat]
+SafeTestsets = "0.1, 1"
+SciMLTesting = "1"
+julia = "1.10"
diff --git a/test/qa/qa.jl b/test/qa/qa.jl
new file mode 100644
index 0000000..d77c55b
--- /dev/null
+++ b/test/qa/qa.jl
@@ -0,0 +1,5 @@
+using PDESystemLibrary, Aqua, JET
+using SciMLTesting
+
+run_qa(PDESystemLibrary; Aqua = Aqua, JET = JET, jet = true,
+    jet_kwargs = (; target_defined_modules = true))
diff --git a/test/runtests.jl b/test/runtests.jl
index f91233f..a18a7cc 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,18 +1,2 @@
-# The test is simply that all of the examples build!
-using SafeTestsets
-
-const GROUP = get(ENV, "GROUP", "All")
-const is_APPVEYOR = Sys.iswindows() && haskey(ENV, "APPVEYOR")
-const is_TRAVIS = haskey(ENV, "TRAVIS")
-
-if GROUP == "All" || GROUP == "MOL"
-    @time @safetestset "Test against MethodOfLines.jl" begin
-        include("mol_test.jl")
-    end
-end
-
-# TODO: fix this when NeuralPDE.jl can be added to the test environment. (compat with Symbolics.jl 5)
-
-# if GROUP == "All" || GROUP == "NeuralPDE"
-#     @time @safetestset "Test against NeuralPDE.jl" begin include("neuralpde_test.jl") end
-# end
+using SciMLTesting
+run_tests()
diff --git a/test/test_groups.toml b/test/test_groups.toml
new file mode 100644
index 0000000..1fe84cd
--- /dev/null
+++ b/test/test_groups.toml
@@ -0,0 +1,5 @@
+[Core]
+versions = ["lts", "1", "pre"]
+
+[QA]
+versions = ["lts", "1"]