diff --git a/storage/influxdb/influxdb_test.go b/storage/influxdb/influxdb_test.go
index 4d79de5e..e5f5287b 100644
--- a/storage/influxdb/influxdb_test.go
+++ b/storage/influxdb/influxdb_test.go
@@ -25,8 +25,7 @@ import (
 )
 
 func runStorageTest(f func(storage.StorageDriver, *testing.T), t *testing.T) {
-	// randomly generate a machine name to mimic multi-machine senario.
-	machineName := "machine-A"
+	machineName := "machineA"
 	tablename := "t"
 	database := "cadvisor"
 	username := "root"
@@ -65,7 +64,7 @@ func runStorageTest(f func(storage.StorageDriver, *testing.T), t *testing.T) {
 		t.Fatal(err)
 	}
 	// generate another container's data on same machine.
-	test.StorageDriverFillRandomStatsFunc("containerOnSameMachine", 100)(driver, t)
+	test.StorageDriverFillRandomStatsFunc("containerOnSameMachine", 100, driver, t)
 
 	// generate another container's data on another machine.
 	driverForAnotherMachine, err := New("machineB",
@@ -80,7 +79,7 @@ func runStorageTest(f func(storage.StorageDriver, *testing.T), t *testing.T) {
 		t.Fatal(err)
 	}
 	defer driverForAnotherMachine.Close()
-	test.StorageDriverFillRandomStatsFunc("containerOnAnotherMachine", 100)(driverForAnotherMachine, t)
+	test.StorageDriverFillRandomStatsFunc("containerOnAnotherMachine", 100, driverForAnotherMachine, t)
 	f(driver, t)
 }
 
@@ -105,6 +104,5 @@ func TestNoRecentStats(t *testing.T) {
 }
 
 func TestNoSamples(t *testing.T) {
-	runStorageTest(test.StorageDriverFillRandomStatsFunc("otherContainer", 100), t)
 	runStorageTest(test.StorageDriverTestNoSamples, t)
 }
diff --git a/storage/test/storagetests.go b/storage/test/storagetests.go
index 9755d0ab..d953f2b9 100644
--- a/storage/test/storagetests.go
+++ b/storage/test/storagetests.go
@@ -83,36 +83,35 @@ func samplesInTrace(samples []*info.ContainerStatsSample, cpuTrace, memTrace []u
 	}
 }
 
-// This function returns a function that will generate random stats and write
-// them into the storage. The returned function will not close the driver of
-// the call, which could be served as a building block to do other works
+// This function will generate random stats and write
+// them into the storage. The function will not close the driver
 func StorageDriverFillRandomStatsFunc(
 	containerName string,
 	N int,
-) func(driver storage.StorageDriver, t *testing.T) {
-	return func(driver storage.StorageDriver, t *testing.T) {
-		cpuTrace := make([]uint64, 0, N)
-		memTrace := make([]uint64, 0, N)
+	driver storage.StorageDriver,
+	t *testing.T,
+) {
+	cpuTrace := make([]uint64, 0, N)
+	memTrace := make([]uint64, 0, N)
 
-		// We need N+1 observations to get N samples
-		for i := 0; i < N+1; i++ {
-			cpuTrace = append(cpuTrace, uint64(rand.Intn(1000)))
-			memTrace = append(memTrace, uint64(rand.Intn(1000)))
-		}
+	// We need N+1 observations to get N samples
+	for i := 0; i < N+1; i++ {
+		cpuTrace = append(cpuTrace, uint64(rand.Intn(1000)))
+		memTrace = append(memTrace, uint64(rand.Intn(1000)))
+	}
 
-		samplePeriod := 1 * time.Second
+	samplePeriod := 1 * time.Second
 
-		ref := info.ContainerReference{
-			Name: containerName,
-		}
+	ref := info.ContainerReference{
+		Name: containerName,
+	}
 
-		trace := buildTrace(cpuTrace, memTrace, samplePeriod)
+	trace := buildTrace(cpuTrace, memTrace, samplePeriod)
 
-		for _, stats := range trace {
-			err := driver.AddStats(ref, stats)
-			if err != nil {
-				t.Fatalf("unable to add stats: %v", err)
-			}
+	for _, stats := range trace {
+		err := driver.AddStats(ref, stats)
+		if err != nil {
+			t.Fatalf("unable to add stats: %v", err)
 		}
 	}
 }