diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
index 6d096a8..5a70ec0 100644
--- a/.github/workflows/cicd.yaml
+++ b/.github/workflows/cicd.yaml
@@ -21,9 +21,21 @@ jobs:
         working-directory: build
         run: make build
       
-      - name: Run Unit Tests
+      - name: Run Unit Tests (Main)
         working-directory: build
-        run: make unit-tests-run
+        run: make unit-tests-run-main
+      
+      - name: Run Unit Tests (Single Threaded)
+        working-directory: build
+        run: make unit-tests-run-single-threaded
+      
+      - name: Run Unit Tests (SpecFlow)
+        working-directory: build
+        run: make unit-tests-run-specflow
+      
+      - name: Run Unit Tests (Reqnroll)
+        working-directory: build
+        run: make unit-tests-run-reqnroll
 
       - name: Create Nuget Packages
         working-directory: build
diff --git a/build/Makefile b/build/Makefile
index 481e6af..fc8bb29 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -39,18 +39,27 @@ build: clean
 		dotnet build -c Release --no-restore
 
 .PHONY: unit-tests-run
-unit-tests-run:
+unit-tests-run: unit-tests-run-main unit-tests-run-single-threaded unit-tests-run-specflow unit-tests-run-reqnroll
+
+.PHONY: unit-tests-run-main
+unit-tests-run-main:
 	cd ../test/UnitTests && \
 		dotnet test --no-build -c Release --logger:trx\;logfilename=../../../artefacts/testResults/UnitTests.trx
 
+.PHONY: unit-tests-run-single-threaded
+unit-tests-run-single-threaded:
 #  Run the single threaded tests with a timeout, as they test deadlock scenarios which would never return if failing
 #	You can tell if this times out as it returns exit code 124, which make prints as "Error 124"
 	cd ../test/UnitTests.SingleThreaded && \
 		timeout 10 dotnet test --no-build -c Release --logger:trx\;logfilename=../../../artefacts/testResults/UnitTests.SingleThreaded.trx
-	
+
+.PHONY: unit-tests-run-specflow
+unit-tests-run-specflow:
 	cd ../test/UnitTests.SpecFlow && \
 		dotnet test --no-build -c Release --logger:trx\;logfilename=../../../artefacts/testResults/UnitTests.SpecFlow.trx
-	
+
+.PHONY: unit-tests-run-reqnroll
+unit-tests-run-reqnroll:
 	cd ../test/UnitTests.Reqnroll && \
 		dotnet test --no-build -c Release --logger:trx\;logfilename=../../../artefacts/testResults/UnitTests.Reqnroll.trx