Index: scripts/run-tests.sh
===================================================================
RCS file: /cvs/drupal/drupal/scripts/run-tests.sh,v
retrieving revision 1.23
diff -u -r1.23 run-tests.sh
--- scripts/run-tests.sh	1 Feb 2009 16:42:26 -0000	1.23
+++ scripts/run-tests.sh	19 Feb 2009 06:00:31 -0000
@@ -80,11 +80,15 @@
 // Display results before database is cleared.
 simpletest_script_reporter_display_results();
 
-// Cleanup our test results.
-db_delete("simpletest")
-  ->condition('test_id', $test_id)
-  ->execute();
-
+if (variable_get('simpletest_clear_results', TRUE)) {
+  // Cleanup our test results.
+  db_delete("simpletest")
+    ->condition('test_id', $test_id)
+    ->execute();
+  db_delete("simpletest_test_id")
+    ->condition('test_id', $test_id)
+    ->execute();
+}
 
 /**
  * Print help text.
Index: modules/simpletest/simpletest.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v
retrieving revision 1.36
diff -u -r1.36 simpletest.module
--- modules/simpletest/simpletest.module	13 Feb 2009 00:39:01 -0000	1.36
+++ modules/simpletest/simpletest.module	19 Feb 2009 06:00:31 -0000
@@ -124,8 +124,12 @@
 
     // Clear test results.
     if (variable_get('simpletest_clear_results', TRUE)) {
-      db_query('DELETE FROM {simpletest} WHERE test_id = %d', $_SESSION['test_id']);
-      db_query('DELETE FROM {simpletest_test_id} WHERE test_id = %d', $_SESSION['test_id']);
+      db_delete("simpletest")
+        ->condition('test_id', $_SESSION['test_id'])
+        ->execute();
+      db_delete("simpletest_test_id")
+        ->condition('test_id', $_SESSION['test_id'])
+        ->execute();
     }
     unset($_SESSION['test_id']);
 
@@ -571,8 +575,8 @@
     $count = db_result(db_query('SELECT COUNT(test_id) FROM {simpletest_test_id}'));
 
     // Clear test results.
-    db_query('DELETE FROM {simpletest}');
-    db_query('DELETE FROM {simpletest_test_id}');
+    db_delete("simpletest")->execute();
+    db_delete("simpletest_test_id")->execute();
 
     drupal_set_message(t('Removed @count test results.', array('@count' => $count)));
   }