diff --git a/runtime_test.go b/runtime_test.go
index 7c12832e30..07765e2d08 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -147,8 +147,13 @@ func init() {
 		panic(err)
 	}
 
+	deviceset := devmapper.NewDeviceSetDM(unitTestStoreDevicesBase)
+	// Create a device, which triggers the initiation of the base FS
+	// This avoids other tests doing this and timing out
+	deviceset.AddDevice("init","")
+
 	// Make it our Store root
-	if runtime, err := NewRuntimeFromDirectory(unitTestStoreBase, devmapper.NewDeviceSetDM(unitTestStoreDevicesBase), false); err != nil {
+	if runtime, err := NewRuntimeFromDirectory(unitTestStoreBase, deviceset, false); err != nil {
 		panic(err)
 	} else {
 		globalRuntime = runtime