diff --git a/services/sync/tests/unit/test_corrupt_keys.js b/services/sync/tests/unit/test_corrupt_keys.js
index 36dc8b93059f..715f709b2a54 100644
--- a/services/sync/tests/unit/test_corrupt_keys.js
+++ b/services/sync/tests/unit/test_corrupt_keys.js
@@ -9,7 +9,7 @@ Cu.import("resource://services-sync/engines/tabs.js");
 Cu.import("resource://services-sync/engines/history.js");
 Cu.import("resource://services-sync/log4moz.js");
   
-function test_locally_changed_keys() {
+add_test(function test_locally_changed_keys() {
   let passphrase = "abcdeabcdeabcdeabcdeabcdea";
 
   // Tracking info/collections.
@@ -33,7 +33,6 @@ function test_locally_changed_keys() {
   
   Weave.Service.handleHMACEvent = counting(Weave.Service.handleHMACEvent);
   
-  do_test_pending();
   let server = httpd_setup({
     // Special.
     "/1.1/johndoe/storage/meta/global": upd("meta", meta_global.handler()),
@@ -232,13 +231,13 @@ function test_locally_changed_keys() {
     
   } finally {
     Weave.Svc.Prefs.resetBranch("");
-    server.stop(do_test_finished);
+    server.stop(run_next_test);
   }
-}
+});
 
 function run_test() {
   let logger = Log4Moz.repository.rootLogger;
   Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
   
-  test_locally_changed_keys();
+  run_next_test();
 }