diff --git a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
index 37d50f3dd1..4d0e0f5b1c 100644
--- a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
+++ b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
@@ -48,6 +48,7 @@ import org.netbeans.jellytools.MainWindowOperator;
 import org.netbeans.jellytools.NbDialogOperator;
 import org.netbeans.jellytools.WizardOperator;
 import org.netbeans.jemmy.Timeout;
+import org.netbeans.jemmy.Timeouts;
 import org.netbeans.jemmy.operators.JButtonOperator;
 import org.netbeans.jemmy.operators.JListOperator;
 import org.netbeans.jemmy.operators.JCheckBoxOperator;
@@ -117,6 +118,7 @@ public class RegressionTest extends TestCase {
     public void setUp() {
 
         logger.info("########  " + System.getProperty("img_path") + "  #######");
+        Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000);
     }
 
     /**
diff --git a/test/script/regression_utils.py b/test/script/regression_utils.py
index 025086f1ae..53f10da281 100644
--- a/test/script/regression_utils.py
+++ b/test/script/regression_utils.py
@@ -21,7 +21,7 @@ def make_path(*dirs):
 
 # Fix a standard os.path by making it Windows format
 def path_fix(path):
-	return path.replace("/", "\\")
+	return os.path.normcase(os.path.normpath(path))
 
 # Gets the true current working directory instead of Cygwin's
 def wgetcwd():