diff --git a/yamf-acceptancetests/src/main/java/nz/ac/wgtn/yamf/checks/junit/JUnitActions.java b/yamf-acceptancetests/src/main/java/nz/ac/wgtn/yamf/checks/junit/JUnitActions.java
index b175029..1b5e787 100644
--- a/yamf-acceptancetests/src/main/java/nz/ac/wgtn/yamf/checks/junit/JUnitActions.java
+++ b/yamf-acceptancetests/src/main/java/nz/ac/wgtn/yamf/checks/junit/JUnitActions.java
@@ -13,6 +13,7 @@
 import java.util.Date;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.lang.System;
 
 /**
  * Actions to run tests (usually acceptance tests).
@@ -26,6 +27,9 @@ public class JUnitActions {
     public static final String JUNIT_REPORT_FOLDER = ".junit-reports";
     public static final String JUPITER_REPORT_NAME = "TEST-junit-jupiter.xml";
     public static final String VINTAGE_REPORT_NAME = "TEST-junit-vintage.xml";
+    
+    private static boolean isWindows = false;
+    private static boolean osChecked = false;
 
     public static final DateFormat FOLDERNAME_FROM_TIMESTAMP_FORMAT = new java.text.SimpleDateFormat("yyyy-MM-dd--HH-mm-ss--SSS");
 
@@ -51,7 +55,11 @@ public static TestResults test (File junitRunner, String testClass, String class
             result = OS.exe(new File("."), "java","-jar", junitRunner.getAbsolutePath(), "-reports-dir",junitReportFolder.getAbsolutePath(),"-c",testClass);
         }
         else {
-            result = OS.exe(new File("."), "java","-jar", junitRunner.getAbsolutePath(), "-reports-dir",junitReportFolder.getAbsolutePath(),"-cp",classpath,"-c",testClass);
+            if (checkOSisWindows()) {
+                result = adjustRunnerForWindows(classpath, junitRunner, junitReportFolder, testClass);
+            } else {
+                result = OS.exe(new File("."), "java","-jar", junitRunner.getAbsolutePath(), "-reports-dir",junitReportFolder.getAbsolutePath(),"-cp",classpath,"-c",testClass);
+            }
         }
 
         // parse results
@@ -105,6 +113,38 @@ private static void extractStatsFromReport(File junitReport, TestResults testRes
         int testResultingInErrorCounts = XML.evalXPathSingleNodeAsInt(junitReport, "/testsuite/@errors");
         testResults.addToTestsWithErrors(testResultingInErrorCounts);
     }
+    
+    private static ProcessResult adjustRunnerForWindows(String classpath, File junitRunner, File junitReportFolder, String testClass) throws Exception {     
+        //Prepend junit jar to classpath
+        classpath = junitRunner.getAbsolutePath()+File.pathSeparator+classpath;
+            
+        //Extract spring-mock dependency from classpath, and append to end        
+        String[] cp = classpath.split(File.pathSeparator);
+        String cp2 = "";
+        String mock = "";
+        for (int i = 0; i < cp.length; i++) {
+            if (!cp[i].contains("spring-mock")) {
+                cp2 += cp[i] + File.pathSeparator;
+            } else {
+                mock = cp[i];
+            }
+        }
+        cp2 += File.pathSeparator+mock;
+        
+        //Execute jar from classpath
+        return OS.exe(new File("."), "java","-cp", cp2, "org.junit.platform.console.ConsoleLauncher", "-reports-dir",junitReportFolder.getAbsolutePath(),"-c",testClass);
+    }
+    
+    private static boolean checkOSisWindows() {
+        if (!osChecked) {
+            if (System.getProperty("os.name").toLowerCase().contains("win")) {
+                isWindows = true;
+            }   
+            osChecked = true;
+        }
+        
+        return isWindows;
+    }
 
 
 }