diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js
index a8fcfabbdf..4bbee0696f 100644
--- a/tools/tests/package-tests.js
+++ b/tools/tests/package-tests.js
@@ -581,7 +581,8 @@ selftest.define("update server package data unit test",
 
 // Add packages to an app. Change the contents of the packages and their
 // dependencies, make sure that the app still refreshes.
-selftest.define("package with --name", ['test-package-server'], function () {
+selftest.define("package with --name",
+    ['test-package-server', "checkout"], function () {
   var s = new Sandbox();
   var run;
 
@@ -626,7 +627,8 @@ selftest.define("package with --name", ['test-package-server'], function () {
   run.stop();
 });
 
-selftest.define("talk to package server with expired or no accounts token", ['net', 'test-package-server'], function () {
+selftest.define("talk to package server with expired or no accounts token",
+  ['net', 'test-package-server'], function () {
   var s = new Sandbox();
   testUtils.login(s, "test", "testtest");
 
@@ -698,7 +700,8 @@ var changeVersionAndPublish = function (s, expectAuthorizationFailure) {
   }
 };
 
-selftest.define("packages with organizations", ["net", "test-package-server"], function () {
+selftest.define("packages with organizations",
+    ["net", "test-package-server"], function () {
   var s = new Sandbox();
   testUtils.login(s, "test", "testtest");
 
diff --git a/tools/tests/publish.js b/tools/tests/publish.js
index 9b534dbd74..98b3749f2c 100644
--- a/tools/tests/publish.js
+++ b/tools/tests/publish.js
@@ -7,7 +7,8 @@ var stats = require('../stats.js');
 var Sandbox = selftest.Sandbox;
 var files = require('../files.js');
 
-selftest.define("publish-and-search", ["slow", "net", "test-package-server"], function () {
+selftest.define("publish-and-search",
+    ["slow", "net", "test-package-server", "checkout"], function () {
   var s = new Sandbox;
 
   var username = "test";
@@ -101,7 +102,8 @@ selftest.define("publish-and-search", ["slow", "net", "test-package-server"], fu
   run.match("package: " + packageName);
 });
 
-selftest.define("publish-one-arch", ["slow", "net", "test-package-server"], function () {
+selftest.define("publish-one-arch",
+    ["slow", "net", "test-package-server", "checkout"], function () {
   var s = new Sandbox;
 
   var username = "test";
@@ -139,7 +141,8 @@ selftest.define("publish-one-arch", ["slow", "net", "test-package-server"], func
 });
 
 selftest.define("list-with-a-new-version",
-                ["slow", "net", "test-package-server"], function () {
+    ["slow", "net", "test-package-server", "checkout"],
+    function () {
   var s = new Sandbox;
 
   var username = "test";
@@ -268,7 +271,8 @@ selftest.define("list-with-a-new-version",
 
 
 selftest.define("do-not-update-to-rcs",
-                ["slow", "net", "test-package-server"], function () {
+    ["slow", "net", "test-package-server", "checkout"],
+    function () {
   var s = new Sandbox;
 
   var username = "test";
@@ -389,7 +393,7 @@ selftest.define("do-not-update-to-rcs",
 
 
 selftest.define("package-depends-on-either-version",
-    ["slow", "net", "test-package-server"], function () {
+    ["slow", "net", "test-package-server", "checkout"], function () {
   var s = new Sandbox;
 
   var username = "test";