diff --git a/services/sync/tests/unit/test_async_querySpinningly.js b/services/sync/tests/unit/test_async_querySpinningly.js
index 25954952372e..f08ba2b47f0c 100644
--- a/services/sync/tests/unit/test_async_querySpinningly.js
+++ b/services/sync/tests/unit/test_async_querySpinningly.js
@@ -3,82 +3,89 @@ Cu.import("resource://services-sync/async.js");
 
 const SQLITE_CONSTRAINT_VIOLATION = 19;  // http://www.sqlite.org/c3ref/c_abort.html
 
+function querySpinningly(query, names) {
+  let q = Svc.Form.DBConnection.createStatement(query);
+  let r = Async.querySpinningly(q, names);
+  q.finalize();    
+  return r;
+}
+
 function run_test() {
   initTestLogging("Trace");
 
-  _("Using the form service to test queries");
-  function c(query) Svc.Form.DBConnection.createStatement(query);
-
   _("Make sure the call is async and allows other events to process");
   let isAsync = false;
   Utils.nextTick(function() { isAsync = true; });
   do_check_false(isAsync);
 
   _("Empty out the formhistory table");
-  let r0 = Async.querySpinningly(c("DELETE FROM moz_formhistory"));
+  let r0 = querySpinningly("DELETE FROM moz_formhistory");
   do_check_eq(r0, null);
 
   _("Make sure there's nothing there");
-  let r1 = Async.querySpinningly(c("SELECT 1 FROM moz_formhistory"));
+  let r1 = querySpinningly("SELECT 1 FROM moz_formhistory");
   do_check_eq(r1, null);
 
   _("Insert a row");
-  let r2 = Async.querySpinningly(c("INSERT INTO moz_formhistory (fieldname, value) VALUES ('foo', 'bar')"));
+  let r2 = querySpinningly("INSERT INTO moz_formhistory (fieldname, value) VALUES ('foo', 'bar')");
   do_check_eq(r2, null);
 
   _("Request a known value for the one row");
-  let r3 = Async.querySpinningly(c("SELECT 42 num FROM moz_formhistory"), ["num"]);
+  let r3 = querySpinningly("SELECT 42 num FROM moz_formhistory", ["num"]);
   do_check_eq(r3.length, 1);
   do_check_eq(r3[0].num, 42);
 
   _("Get multiple columns");
-  let r4 = Async.querySpinningly(c("SELECT fieldname, value FROM moz_formhistory"), ["fieldname", "value"]);
+  let r4 = querySpinningly("SELECT fieldname, value FROM moz_formhistory", ["fieldname", "value"]);
   do_check_eq(r4.length, 1);
   do_check_eq(r4[0].fieldname, "foo");
   do_check_eq(r4[0].value, "bar");
 
   _("Get multiple columns with a different order");
-  let r5 = Async.querySpinningly(c("SELECT fieldname, value FROM moz_formhistory"), ["value", "fieldname"]);
+  let r5 = querySpinningly("SELECT fieldname, value FROM moz_formhistory", ["value", "fieldname"]);
   do_check_eq(r5.length, 1);
   do_check_eq(r5[0].fieldname, "foo");
   do_check_eq(r5[0].value, "bar");
 
   _("Add multiple entries (sqlite doesn't support multiple VALUES)");
-  let r6 = Async.querySpinningly(c("INSERT INTO moz_formhistory (fieldname, value) SELECT 'foo', 'baz' UNION SELECT 'more', 'values'"));
+  let r6 = querySpinningly("INSERT INTO moz_formhistory (fieldname, value) SELECT 'foo', 'baz' UNION SELECT 'more', 'values'");
   do_check_eq(r6, null);
 
   _("Get multiple rows");
-  let r7 = Async.querySpinningly(c("SELECT fieldname, value FROM moz_formhistory WHERE fieldname = 'foo'"), ["fieldname", "value"]);
+  let r7 = querySpinningly("SELECT fieldname, value FROM moz_formhistory WHERE fieldname = 'foo'", ["fieldname", "value"]);
   do_check_eq(r7.length, 2);
   do_check_eq(r7[0].fieldname, "foo");
   do_check_eq(r7[1].fieldname, "foo");
 
   _("Make sure updates work");
-  let r8 = Async.querySpinningly(c("UPDATE moz_formhistory SET value = 'updated' WHERE fieldname = 'more'"));
+  let r8 = querySpinningly("UPDATE moz_formhistory SET value = 'updated' WHERE fieldname = 'more'");
   do_check_eq(r8, null);
 
   _("Get the updated");
-  let r9 = Async.querySpinningly(c("SELECT value, fieldname FROM moz_formhistory WHERE fieldname = 'more'"), ["fieldname", "value"]);
+  let r9 = querySpinningly("SELECT value, fieldname FROM moz_formhistory WHERE fieldname = 'more'", ["fieldname", "value"]);
   do_check_eq(r9.length, 1);
   do_check_eq(r9[0].fieldname, "more");
   do_check_eq(r9[0].value, "updated");
 
   _("Grabbing fewer fields than queried is fine");
-  let r10 = Async.querySpinningly(c("SELECT value, fieldname FROM moz_formhistory"), ["fieldname"]);
+  let r10 = querySpinningly("SELECT value, fieldname FROM moz_formhistory", ["fieldname"]);
   do_check_eq(r10.length, 3);
 
   _("Generate an execution error");
-  let r11, except, query = c("INSERT INTO moz_formhistory (fieldname, value) VALUES ('one', NULL)");
+  let query = "INSERT INTO moz_formhistory (fieldname, value) VALUES ('one', NULL)";
+  let stmt = Svc.Form.DBConnection.createStatement(query);
+  let r11, except; ;
   try {
-    r11 = Async.querySpinningly(query);
+    r11 = Async.querySpinningly(stmt);
   } catch(e) {
     except = e;
   }
+  stmt.finalize()
   do_check_true(!!except);
   do_check_eq(except.result, SQLITE_CONSTRAINT_VIOLATION);
 
   _("Cleaning up");
-  Async.querySpinningly(c("DELETE FROM moz_formhistory"));
+  querySpinningly("DELETE FROM moz_formhistory");
 
   _("Make sure the timeout got to run before this function ends");
   do_check_true(isAsync);