diff --git a/components/engine/devmapper/deviceset_devmapper.go b/components/engine/devmapper/deviceset_devmapper.go
index d9557659c7..b789f94aa3 100644
--- a/components/engine/devmapper/deviceset_devmapper.go
+++ b/components/engine/devmapper/deviceset_devmapper.go
@@ -881,7 +881,6 @@ func (devices *DeviceSetDM) SetInitialized(hash string) error {
 }
 
 func (devices *DeviceSetDM) ensureInit() error {
-	utils.Debugf("ensureInit(). Initialized: %v", devices.initialized)
 	if !devices.initialized {
 		devices.initialized = true
 		if err := devices.initDevmapper(); err != nil {
diff --git a/components/engine/hack/make/test b/components/engine/hack/make/test
index 1dadbdab8e..10264d9f7f 100644
--- a/components/engine/hack/make/test
+++ b/components/engine/hack/make/test
@@ -11,7 +11,7 @@ bundle_test() {
 		for test_dir in $(find_test_dirs); do (
 			set -x
 			cd $test_dir
-			DEBUG=1 go test -v -ldflags "$LDFLAGS" $BUILDFLAGS -run TestRunHostname
+			DEBUG=1 go test -v -ldflags "$LDFLAGS" $BUILDFLAGS
 		)  done
 	} 2>&1 | tee $DEST/test.log
 }
diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go
index 7c12832e30..07765e2d08 100644
--- a/components/engine/runtime_test.go
+++ b/components/engine/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