diff --git a/libnetwork/sandbox_test.go b/libnetwork/sandbox_test.go
index a8fbce3e75..4370b05dd5 100644
--- a/libnetwork/sandbox_test.go
+++ b/libnetwork/sandbox_test.go
@@ -33,6 +33,7 @@ func getTestEnv(t *testing.T, opts ...[]NetworkOption) (NetworkController, []Net
 	if err != nil {
 		t.Fatal(err)
 	}
+	t.Cleanup(c.Stop)
 
 	if len(opts) == 0 {
 		return c, nil
diff --git a/libnetwork/store_linux_test.go b/libnetwork/store_linux_test.go
index c02d8c8b55..09ced57887 100644
--- a/libnetwork/store_linux_test.go
+++ b/libnetwork/store_linux_test.go
@@ -25,6 +25,7 @@ func TestNoPersist(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error new controller: %v", err)
 	}
+	defer ctrl.Stop()
 	nw, err := ctrl.NewNetwork("host", "host", "", NetworkOptionPersist(false))
 	if err != nil {
 		t.Fatalf("Error creating default \"host\" network: %v", err)
diff --git a/libnetwork/store_test.go b/libnetwork/store_test.go
index 668662ffcb..68192fcaa8 100644
--- a/libnetwork/store_test.go
+++ b/libnetwork/store_test.go
@@ -27,6 +27,7 @@ func testLocalBackend(t *testing.T, provider, url string, storeConfig *store.Con
 	if err != nil {
 		t.Fatalf("Error new controller: %v", err)
 	}
+	defer ctrl.Stop()
 	nw, err := ctrl.NewNetwork("host", "host", "")
 	if err != nil {
 		t.Fatalf("Error creating default \"host\" network: %v", err)
@@ -49,6 +50,7 @@ func testLocalBackend(t *testing.T, provider, url string, storeConfig *store.Con
 	if err != nil {
 		t.Fatalf("Error creating controller: %v", err)
 	}
+	defer ctrl.Stop()
 	if _, err = ctrl.NetworkByID(nw.ID()); err != nil {
 		t.Fatalf("Error getting network %v", err)
 	}
@@ -82,8 +84,9 @@ func TestMultipleControllersWithSameStore(t *testing.T) {
 	}
 	defer ctrl1.Stop()
 	// Use the same boltdb file without closing the previous controller
-	_, err = New(cfgOptions...)
+	ctrl2, err := New(cfgOptions...)
 	if err != nil {
 		t.Fatalf("Local store must support concurrent controllers")
 	}
+	ctrl2.Stop()
 }