diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index c533c05..d5daf11 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -18,15 +18,6 @@ concurrency:
 
 jobs:
   tests:
-    name: "Tests"
-    strategy:
-      fail-fast: false
-      matrix:
-        group:
-          - Core
-    uses: "SciML/.github/.github/workflows/tests.yml@v1"
-    with:
-      group: ${{ matrix.group }}
-      julia-version: '1'
+    uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1"
     secrets: "inherit"
-    
+
diff --git a/Project.toml b/Project.toml
index 25cb60c..06b8119 100644
--- a/Project.toml
+++ b/Project.toml
@@ -14,12 +14,17 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 [compat]
 Catalyst = "15"
 DiffEqBase = "6, 7"
+Distributions = "0.25"
+LinearAlgebra = "1"
 MacroTools = "^0.5.5"
 OrdinaryDiffEq = "6, 7"
 Reexport = "1"
 RuntimeGeneratedFunctions = "0.5"
+SafeTestsets = "0.1, 1"
+SciMLTesting = "1"
 SteadyStateDiffEq = "1, 2"
 Sundials = "4, 5, 6"
+Test = "1"
 julia = "1.10"
 
 [extras]
@@ -27,9 +32,10 @@ Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Distributions", "LinearAlgebra", "OrdinaryDiffEq", "SafeTestsets", "SteadyStateDiffEq", "Sundials", "Test"]
+test = ["Distributions", "LinearAlgebra", "OrdinaryDiffEq", "SafeTestsets", "SciMLTesting", "SteadyStateDiffEq", "Sundials", "Test"]
diff --git a/test/qa/Project.toml b/test/qa/Project.toml
new file mode 100644
index 0000000..8a8cf05
--- /dev/null
+++ b/test/qa/Project.toml
@@ -0,0 +1,18 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+FiniteStateProjection = "069e79ea-d681-44e8-b935-95bdaf9e8f28"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[sources]
+FiniteStateProjection = { path = "../.." }
+
+[compat]
+Aqua = "0.8"
+JET = "0.9,0.10,0.11"
+SafeTestsets = "0.1, 1"
+SciMLTesting = "1"
+Test = "1"
+julia = "1.10"
diff --git a/test/qa/qa.jl b/test/qa/qa.jl
new file mode 100644
index 0000000..9a31475
--- /dev/null
+++ b/test/qa/qa.jl
@@ -0,0 +1,12 @@
+using FiniteStateProjection
+using Aqua
+using JET
+using Test
+
+@testset "Aqua" begin
+    Aqua.test_all(FiniteStateProjection)
+end
+
+@testset "JET" begin
+    JET.test_package(FiniteStateProjection; target_defined_modules = true)
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 2d2be8b..80ba099 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,13 +1,3 @@
-using SafeTestsets
+using SciMLTesting
 
-@time begin
-    @safetestset "Telegraph" begin
-        include("telegraph.jl")
-    end
-    @safetestset "FeedbackLoop" begin
-        include("feedbackloop.jl")
-    end
-    @safetestset "BirthDeath2D" begin
-        include("birthdeath2D.jl")
-    end
-end
+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"]