diff --git a/conftest.py b/conftest.py
index cc513fe..03b9155 100644
--- a/conftest.py
+++ b/conftest.py
@@ -170,7 +170,7 @@ def webdriver( request ):
     driver.set_window_size( int(words[0]), int(words[1]) )
 
     # return the webdriver to the caller
-    yield driver
-
-    # clean up
-    driver.close()
+    try:
+        yield driver
+    finally:
+        driver.quit()