diff --git a/test/abort_result b/test/abort_result
new file mode 100644
index 0000000000..ccbe669daa
--- /dev/null
+++ b/test/abort_result
@@ -0,0 +1,13 @@
+<file_info>
+    <name><OUTFILE_0/></name>
+    <generated_locally/>
+    <upload_when_present/>
+    <max_nbytes>10000</max_nbytes>
+    <url><UPLOAD_URL/></url>
+</file_info>
+<result>
+    <file_ref>
+        <file_name><OUTFILE_0/></file_name>
+        <open_name>out</open_name>
+    </file_ref>
+</result>
diff --git a/test/laptop_prefs.xml b/test/laptop_prefs.xml
deleted file mode 100644
index 2869d7be65..0000000000
--- a/test/laptop_prefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<preferences>
-    <dont_run_on_batteries/>
-    <high_water_days>10</high_water_days>
-    <low_water_days>1</low_water_days>
-    <disk_max_used_gb>0.4</disk_max_used_gb>
-    <disk_max_used_pct>50</disk_max_used_pct>
-    <disk_min_free_gb>0.4</disk_min_free_gb>
-    <project>
-        <master_url>BOINC_MASTER_URL</master_url>
-        <authenticator>3f7b90793a0175ad0bda68684e8bd136</authenticator>
-        <resource_share>10</resource_share>
-        <project_specific>
-            <color-scheme>Tahiti Sunset</color-scheme>
-        </project_specific>
-    </project>
-</preferences>
diff --git a/test/test.inc b/test/test.inc
index c75320dec2..77f6abf60c 100644
--- a/test/test.inc
+++ b/test/test.inc
@@ -204,6 +204,12 @@ function create_keys() {
     XPassThru("$lib_dir/crypt_prog -genkey 1024 $key_dir/code_sign_private $key_dir/code_sign_public");
 }
 
+function check_exists($file) {
+    if (file_exists($file)) {
+        error("file doesn't exist: $file\n");
+    }
+}
+
 function check_deleted($file) {
     if (file_exists($file)) {
         error("file wasn't deleted: $file\n");
@@ -828,6 +834,10 @@ $matchresult->stderr_out
         check_deleted("$this->project_dir/" . $file);
     }
 
+    function check_server_exists($file) {
+        check_exists("$this->project_dir/" . $file);
+    }
+
 }
 
 // represents an account on a particular project
diff --git a/test/test_abort.php b/test/test_abort.php
new file mode 100644
index 0000000000..7b12d8e779
--- /dev/null
+++ b/test/test_abort.php
@@ -0,0 +1,42 @@
+#!/usr/local/bin/php -q
+<?php {
+    // This tests whether the result abort mechanism is working
+
+    include_once("test.inc");
+
+    test_msg("result abort mechanism (disk space limit)");
+
+    $project = new Project;
+    $project->add_app_and_version("upper_case");
+
+    $user = new User();
+
+    $project->add_user($user);
+    $project->install();      // must install projects before adding to hosts
+    $project->install_feeder();
+
+    $host = new Host();
+    $host->add_user($user, $project);
+    $host->install();
+
+    $work = new Work();
+    $work->wu_template = "uc_wu";
+    $work->result_template = "abort_result";
+    $work->redundancy = 2;
+    array_push($work->input_files, "input");
+    $work->install($project);
+
+    $project->start_servers();
+    $host->run("-exit_when_idle -skip_cpu_benchmarks -sched_retry_delay_min 1 >& /dev/null");
+
+    $project->validate(2);
+    $result->server_state = RESULT_SERVER_STATE_OVER;
+    $project->check_results(2, $result);
+
+    $project->assimilate();
+    $project->file_delete();
+
+    $project->stop();
+
+    test_done();
+} ?>