diff --git a/control/controlclient/auto_test.go b/control/controlclient/auto_test.go
index affed3b0a..4ebd1eaac 100644
--- a/control/controlclient/auto_test.go
+++ b/control/controlclient/auto_test.go
@@ -1031,7 +1031,7 @@ func newServer(t *testing.T) *server {
 			s.control.ServeHTTP(w, r)
 		}
 	}))
-	s.control, err = control.New(tmpdir, tmpdir, s.http.URL, true)
+	s.control, err = control.New(tmpdir, tmpdir, tmpdir, s.http.URL, true)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/control/controlclient/direct_test.go b/control/controlclient/direct_test.go
index a00342c22..bcae24ccf 100644
--- a/control/controlclient/direct_test.go
+++ b/control/controlclient/direct_test.go
@@ -45,7 +45,7 @@ func TestClientsReusingKeys(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true)
+	server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -174,7 +174,7 @@ func TestClientsReusingOldKey(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	server, err = control.New(tmpdir, tmpdir, httpsrv.URL, true)
+	server, err = control.New(tmpdir, tmpdir, tmpdir, httpsrv.URL, true)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/ipn/e2e_test.go b/ipn/e2e_test.go
index 14aa9e6e2..7966f557e 100644
--- a/ipn/e2e_test.go
+++ b/ipn/e2e_test.go
@@ -55,7 +55,7 @@ func TestIPN(t *testing.T) {
 	if err != nil {
 		t.Fatalf("create tempdir: %v\n", err)
 	}
-	ctl, err = control.New(tmpdir, tmpdir, serverURL, true)
+	ctl, err = control.New(tmpdir, tmpdir, tmpdir, serverURL, true)
 	if err != nil {
 		t.Fatalf("create control server: %v\n", ctl)
 	}