diff --git a/test/init.inc b/test/init.inc
index 9e0f580fe2..c6424f0cd3 100644
--- a/test/init.inc
+++ b/test/init.inc
@@ -179,6 +179,13 @@ function check_results_done() {
     }
 }
 
+function num_wus_left() {
+    db_init();
+    $numwus = mysql_query("select count(*) as nres from result where state<>4");
+    $result = mysql_fetch_object($numwus);
+    return $result->nres;
+}
+
 function compare_files($out, $correct) {
     PassThru("diff $out $correct", $retval);
     if ($retval) {
diff --git a/test/sah_result b/test/sah_result
new file mode 100644
index 0000000000..bcd2a45a90
--- /dev/null
+++ b/test/sah_result
@@ -0,0 +1,14 @@
+<file_info>
+    <name><OUTFILE_0/></name>
+    <generated_locally/>
+    <upload_when_present/>
+    <url><UPLOAD_URL/><OUTFILE_0/></url>
+</file_info>
+<result>
+    <name><RESULT_NAME/></name>
+    <wu_name><WU_NAME/></wu_name>
+    <output_file>
+        <file_name><OUTFILE_0/></file_name>
+        <open_name>outfile.sah</open_name>
+    </output_file>
+</result>
diff --git a/test/sah_test.php b/test/sah_test.php
new file mode 100755
index 0000000000..474064bb6e
--- /dev/null
+++ b/test/sah_test.php
@@ -0,0 +1,27 @@
+#! /usr/local/bin/php
+<?php
+    // test the seti@home client
+    //
+    // You must have done "make" in all source directories
+
+    include_once("init.inc");
+
+    check_env_vars();  // THIS IS ABSOLUTELY CRITICAL!!!
+    clear_db();
+    clear_data_dirs();
+    init_client_dirs("account_sah.xml");
+    copy_to_download_dir("work_unit.sah");
+    add_platform();
+    add_core_client();
+    add_user(null);
+    add_app("setiathome-3.06");
+    create_work("-appname setiathome-3.06 -wu_name sah_wu -wu_template sah_wu -result_template sah_result -nresults 1 work_unit.sah");
+    echo "starting feeder\n";
+    start_feeder();
+    echo "started feeder\n";
+    run_client();
+    echo "ran client\n";
+    stop_feeder();
+
+    check_results_done();
+?>
diff --git a/test/sah_wu b/test/sah_wu
new file mode 100644
index 0000000000..aec9cbd3d7
--- /dev/null
+++ b/test/sah_wu
@@ -0,0 +1,14 @@
+<file_info>
+    <name><INFILE_0/></name>
+    <url><DOWNLOAD_URL/><INFILE_0/></url>
+    <md5_cksum><MD5_0/></md5_cksum>
+</file_info>
+<workunit>
+    <name><WU_NAME/></name>
+    <app_name>setiathome-3.06</app_name>
+    <input_file>
+        <file_name><INFILE_0/></file_name>
+        <open_name>work_unit.sah</open_name>
+    </input_file>
+    <command_line>work_unit.sah</command_line>
+</workunit>
diff --git a/test/test_uc_slow.php b/test/test_uc_slow.php
index dc390c9f78..3b9d9276f0 100644
--- a/test/test_uc_slow.php
+++ b/test/test_uc_slow.php
@@ -11,12 +11,13 @@
     clear_data_dirs();
     init_client_dirs("prefs1.xml");
     copy_to_download_dir("small_input");
-    add_platform();
+    add_platform(null);
     add_core_client();
     add_user(null);
     add_app("uc_slow");
     create_work("-appname uc_slow -wu_name ucs_wu -wu_template ucs_wu -result_template ucs_result -nresults 1 small_input");
     echo "Now run the client manually; start and stop it a few times.\n";
+    start_feeder();
     //run_client();
     //compare_file("ucs_wu_0_0", "uc_small_correct_output");
 ?>