diff --git a/test/test_prefs.php b/test/test_prefs.php
index 17c568eef5..91381b776c 100644
--- a/test/test_prefs.php
+++ b/test/test_prefs.php
@@ -17,7 +17,7 @@
 
     $host->log_flags = "log_flags.xml";
     $host->add_project($project);
-    $host->global_prefs = "laptop_prefs.xml";
+    $host->global_prefs = "laptop_prefs";
     $host->install();
 
     echo "adding work\n";
diff --git a/test/test_rsc.php b/test/test_rsc.php
index 6a1dd0ce72..ac208354eb 100644
--- a/test/test_rsc.php
+++ b/test/test_rsc.php
@@ -35,5 +35,6 @@
     $host->run("-exit_when_idle");
     $project->stop();
 
+    $result->state = RESULT_STATE_DONE;
     $project->check_results(0, $result);
 ?>
diff --git a/test/test_suite.php b/test/test_suite.php
index 56ccc7d2ba..96cc05d4f9 100644
--- a/test/test_suite.php
+++ b/test/test_suite.php
@@ -3,33 +3,15 @@
     //Run the comprehensive suite of tests
     //
 
-    PassThru("test_api.php", $retval);
-    if($retval) printf("test_api.php did not run correctly\n");
-
-    //PassThru("test_projects.php", $retval);
-    //if($retval) printf("test_projects.php did not run correctly\n");
-
-    PassThru("test_stderr.php", $retval);
-    if($retval) printf("test_stderr.php did not run correctly\n");
-
-    PassThru("test_uc.php", $retval);
-    if($retval) printf("test_uc.php did not run correctly\n");
-
-    PassThru("test_water.php", $retval);
-    if($retval) printf("test_water.php did not run correctly\n");
-
-    //PassThru("test_1sec.php", $retval);
-    //if($retval) printf("test_1sec.php did not run correctly\n");
+    PassThru("test_1sec.php", $retval);
+    if($retval) printf("test_1sec.php did not run correctly\n");
 
     PassThru("test_concat.php", $retval);
     if($retval) printf("test_concat.php did not run correctly\n");
 
-    //PassThru("test_prefs.php", $retval);
-    //if($retval) printf("test_prefs.php did not run correctly\n");
-
     PassThru("test_rsc.php", $retval);
     if($retval) printf("test_rsc.php did not run correctly\n");
 
-    //PassThru("test_uc_slow.php", $retval);
-    //if($retval) printf("test_uc_slow.php did not run correclty\n");
+    PassThru("test_uc.php", $retval);
+    if($retval) printf("test_uc.php did not run correctly\n");
 ?>