diff --git a/python/GafferDelightTest/InteractiveDelightRenderTest.py b/python/GafferDelightTest/InteractiveDelightRenderTest.py
index 30a7bab91ca..6644a90082d 100644
--- a/python/GafferDelightTest/InteractiveDelightRenderTest.py
+++ b/python/GafferDelightTest/InteractiveDelightRenderTest.py
@@ -86,6 +86,11 @@ def testLightFiltersAndSetEdits( self ) :
 
 		pass
 
+	@unittest.skip( "Need to be able to close old driver _after_ opening new one" )
+	def testEditCropWindow( self ) :
+
+		pass
+
 	def _createConstantShader( self ) :
 
 		shader = GafferOSL.OSLShader()
diff --git a/python/GafferSceneTest/InteractiveRenderTest.py b/python/GafferSceneTest/InteractiveRenderTest.py
index 10971f8ca1b..1861b34f7a3 100644
--- a/python/GafferSceneTest/InteractiveRenderTest.py
+++ b/python/GafferSceneTest/InteractiveRenderTest.py
@@ -2147,6 +2147,12 @@ def testEditCropWindow( self ) :
 		script["renderer"]["state"].setValue( script["renderer"].State.Stopped )
 		self.uiThreadCallHandler.assertCalled() # Wait for saving to complete
 
+		if script["renderer"].typeName() == "GafferCycles::InteractiveCyclesRender" :
+			# Cycles somehow manages to do stuff after we've deleted the CyclesRenderer.
+			# Wait for it to finish.
+			## \todo Figure out why this is needed, and fix it.
+			self.uiThreadCallHandler.waitFor( 1 )
+
 		self.assertNotIn( "gaffer:isRendering", script["catalogue"]["out"].metadata() )
 
 	def tearDown( self ) :