diff --git a/tests/fast_atof.cpp b/tests/fast_atof.cpp
index 473486bc..39da6056 100644
--- a/tests/fast_atof.cpp
+++ b/tests/fast_atof.cpp
@@ -164,6 +164,8 @@ bool fast_atof(void)
 	logTestString("         atof time = %d\n    fast_atof Time = %d\nold fast_atof time = %d\n",
 		atofTime, fastAtofTime, oldFastAtofTime);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	if(fastAtofTime > (1.2f*atofTime))
diff --git a/tests/filesystem.cpp b/tests/filesystem.cpp
index 8a5487cb..4c0c9796 100644
--- a/tests/filesystem.cpp
+++ b/tests/filesystem.cpp
@@ -153,6 +153,8 @@ bool filesystem(void)
 	result &= testgetAbsoluteFilename(fs);
 
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/flyCircleAnimator.cpp b/tests/flyCircleAnimator.cpp
index 41275a87..e7e3456d 100644
--- a/tests/flyCircleAnimator.cpp
+++ b/tests/flyCircleAnimator.cpp
@@ -51,6 +51,8 @@ bool flyCircleAnimator(void)
 		result = takeScreenshotAndCompareAgainstReference(driver, "-flyCircleAnimator.png", 100);
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/guiDisabledMenu.cpp b/tests/guiDisabledMenu.cpp
index 0078a440..d7256a64 100644
--- a/tests/guiDisabledMenu.cpp
+++ b/tests/guiDisabledMenu.cpp
@@ -49,6 +49,8 @@ bool guiDisabledMenu(void)
 	driver->endScene();
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-guiDisabledMenu.png");
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/lightMaps.cpp b/tests/lightMaps.cpp
index 6fb04e3c..2c13d5bc 100644
--- a/tests/lightMaps.cpp
+++ b/tests/lightMaps.cpp
@@ -45,6 +45,8 @@ static bool runTestWithDriver(E_DRIVER_TYPE driverType)
 		}
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/lights.cpp b/tests/lights.cpp
index 17b8437f..f4b43f89 100644
--- a/tests/lights.cpp
+++ b/tests/lights.cpp
@@ -39,6 +39,8 @@ static bool testLightTypes(video::E_DRIVER_TYPE driverType)
 
 	const bool result = takeScreenshotAndCompareAgainstReference(device->getVideoDriver(), "-lightType.png", 99.91f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/loadTextures.cpp b/tests/loadTextures.cpp
index 2fd5ea4b..7e65cb59 100644
--- a/tests/loadTextures.cpp
+++ b/tests/loadTextures.cpp
@@ -82,6 +82,8 @@ bool loadFromFileFolder(void)
 		return false;
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 	return ((tex1 == tex2) && (tex1 == tex3) && (tex1 == tex4));
 }
diff --git a/tests/makeColorKeyTexture.cpp b/tests/makeColorKeyTexture.cpp
index 09a39c31..ff9b283c 100644
--- a/tests/makeColorKeyTexture.cpp
+++ b/tests/makeColorKeyTexture.cpp
@@ -54,6 +54,8 @@ static bool doTestWith(E_DRIVER_TYPE driverType,
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, screenshotName);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/md2Animation.cpp b/tests/md2Animation.cpp
index 4274bdf2..588cdbcf 100644
--- a/tests/md2Animation.cpp
+++ b/tests/md2Animation.cpp
@@ -72,6 +72,8 @@ bool md2Animation(void)
 	}
 
 	result &= takeScreenshotAndCompareAgainstReference(driver, "-md2Animation.png");
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/meshLoaders.cpp b/tests/meshLoaders.cpp
index fe1157f9..b429b66d 100644
--- a/tests/meshLoaders.cpp
+++ b/tests/meshLoaders.cpp
@@ -35,6 +35,8 @@ bool meshLoaders(void)
 		}
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/meshTransform.cpp b/tests/meshTransform.cpp
index ed21cff8..55ceb9a7 100644
--- a/tests/meshTransform.cpp
+++ b/tests/meshTransform.cpp
@@ -80,6 +80,8 @@ bool meshTransform(void)
 
 	result = takeScreenshotAndCompareAgainstReference(driver, "-meshTransform.png");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/orthoCam.cpp b/tests/orthoCam.cpp
index 19f003f6..8422c05e 100644
--- a/tests/orthoCam.cpp
+++ b/tests/orthoCam.cpp
@@ -40,6 +40,8 @@ static bool testOrthoCam(video::E_DRIVER_TYPE driverType)
 
 	const bool result = takeScreenshotAndCompareAgainstReference(device->getVideoDriver(), "-orthoCam.png", 99.91f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -74,6 +76,8 @@ static bool testOrthoStencil(video::E_DRIVER_TYPE driverType)
 
 	const bool result = takeScreenshotAndCompareAgainstReference(device->getVideoDriver(), "-orthoStencil.png", 99.91f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/planeMatrix.cpp b/tests/planeMatrix.cpp
index d981fb19..7ec0f77b 100644
--- a/tests/planeMatrix.cpp
+++ b/tests/planeMatrix.cpp
@@ -80,6 +80,8 @@ static bool drawScaledOctree(void)
 		}
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/removeCustomAnimator.cpp b/tests/removeCustomAnimator.cpp
index c787737b..eaa2d39a 100644
--- a/tests/removeCustomAnimator.cpp
+++ b/tests/removeCustomAnimator.cpp
@@ -41,6 +41,8 @@ bool removeCustomAnimator(void)
 	// deleted cleanly, without a crash.
 	node->OnAnimate(0);
 	
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	// If we didn't crash, then the test passed.
diff --git a/tests/sceneCollisionManager.cpp b/tests/sceneCollisionManager.cpp
index 39c78ba5..94cff314 100644
--- a/tests/sceneCollisionManager.cpp
+++ b/tests/sceneCollisionManager.cpp
@@ -478,6 +478,8 @@ bool sceneCollisionManager(void)
 
 	result &= compareGetSceneNodeFromRayBBWithBBIntersectsWithLine(device, smgr, collMgr);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 	return result;
 }
diff --git a/tests/sceneNodeAnimator.cpp b/tests/sceneNodeAnimator.cpp
index c0b2de94..6ee0b99d 100644
--- a/tests/sceneNodeAnimator.cpp
+++ b/tests/sceneNodeAnimator.cpp
@@ -101,6 +101,8 @@ bool sceneNodeAnimator(void)
 	textureAnimator->drop();
 	textureAnimatorLooping->drop();
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	if(!result)
diff --git a/tests/serializeAttributes.cpp b/tests/serializeAttributes.cpp
index 0d492d56..fef4a2d0 100644
--- a/tests/serializeAttributes.cpp
+++ b/tests/serializeAttributes.cpp
@@ -315,6 +315,8 @@ bool serializeAttributes()
 		logTestString("XmlSerialization failed in %s:%d\n", __FILE__, __LINE__ );
 	}
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/softwareDevice.cpp b/tests/softwareDevice.cpp
index 40a8f573..45c4eb55 100644
--- a/tests/softwareDevice.cpp
+++ b/tests/softwareDevice.cpp
@@ -48,6 +48,8 @@ bool softwareDevice(void)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-softwareDevice-rotatedClip.png");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/stencilshadow.cpp b/tests/stencilshadow.cpp
index 0a6b5387..e23428ca 100644
--- a/tests/stencilshadow.cpp
+++ b/tests/stencilshadow.cpp
@@ -52,6 +52,8 @@ static bool shadows(video::E_DRIVER_TYPE driverType)
 
 	result = takeScreenshotAndCompareAgainstReference(device->getVideoDriver(), "-stencilSelfShadow.png", 99.41f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/terrainSceneNode.cpp b/tests/terrainSceneNode.cpp
index babb8868..137e259b 100644
--- a/tests/terrainSceneNode.cpp
+++ b/tests/terrainSceneNode.cpp
@@ -65,6 +65,8 @@ bool terrainSceneNode(void)
 		logTestString("Large camera up rotation caused bad recalc.\n");
 	}
 
-    device->drop();
+	device->closeDevice();
+	device->run();
+	device->drop();
     return result;
 }
diff --git a/tests/testXML.cpp b/tests/testXML.cpp
index 969bcd63..a2012f5e 100644
--- a/tests/testXML.cpp
+++ b/tests/testXML.cpp
@@ -162,6 +162,8 @@ bool testXML(void)
 	logTestString("Test XML reader attribute support.\n");
 	result &= attributeValues(device->getFileSystem());	
 
-	device->drop();
+	device->closeDevice();
+	device->run();
+	device->drop();
 	return result;
 }
diff --git a/tests/textureFeatures.cpp b/tests/textureFeatures.cpp
index 3f9e2770..b2859253 100644
--- a/tests/textureFeatures.cpp
+++ b/tests/textureFeatures.cpp
@@ -71,6 +71,8 @@ static bool lockAllMipLevels(video::E_DRIVER_TYPE driverType)
 	result |= (bits[0].color==0x001212ff);
 	tex->unlock();
 	
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
diff --git a/tests/timer.cpp b/tests/timer.cpp
index ff67a4d8..935c2ef5 100644
--- a/tests/timer.cpp
+++ b/tests/timer.cpp
@@ -58,6 +58,8 @@ bool testTimer(void)
 	logTestString("Real time and date. %d.%d.%d at %d:%d:%d\n", date.Day, date.Month, date.Year, date.Hour, date.Minute, date.Second);
 	logTestString("This is day %d of the year and weekday %d. The current time zone has daylight saving %s\n", date.Yearday, date.Weekday, date.IsDST?"enabled":"disabled");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return success;
diff --git a/tests/transparentMaterials.cpp b/tests/transparentMaterials.cpp
index 9544d36f..8363ceaa 100644
--- a/tests/transparentMaterials.cpp
+++ b/tests/transparentMaterials.cpp
@@ -41,6 +41,8 @@ bool testTransparentAlphaChannelRef(video::E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentAlphaChannelRef.png", 99.18f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -79,6 +81,8 @@ bool testTransparentAlphaChannel(video::E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentAlphaChannel.png");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -124,6 +128,8 @@ bool testTransparentVertexAlpha(video::E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentVertexAlpha.png", 98.76f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -172,6 +178,8 @@ bool testTransparentReflection2Layer(video::E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentReflection2Layer.png");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -210,6 +218,8 @@ bool testTransparentAddColor(video::E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentAddColor.png");
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;
@@ -257,6 +267,8 @@ bool testTransparentVertexAlphaMore(E_DRIVER_TYPE driverType)
 
 	bool result = takeScreenshotAndCompareAgainstReference(driver, "-transparentVertexAlphaChannelMore.png", 99.18f);
 
+	device->closeDevice();
+	device->run();
 	device->drop();
 
 	return result;