diff --git a/test_conformance/gl/main.cpp b/test_conformance/gl/main.cpp
index e5d6b65daf..625a4842de 100644
--- a/test_conformance/gl/main.cpp
+++ b/test_conformance/gl/main.cpp
@@ -250,19 +250,18 @@ int main(int argc, const char *argv[])
         return error;
     }
 
+    // At least one device supports CL-GL interop, so init the test.
+    if (glEnv->Init(&argc, (char **)argv, CL_FALSE))
+    {
+        log_error(
+            "Failed to initialize the GL environment for this test.\n");
+        return -1;
+    }
+
     // OpenGL tests for non-3.2
     // ////////////////////////////////////////////////////////
     if ((argc == 1) || (first_32_testname != 1))
     {
-
-        // At least one device supports CL-GL interop, so init the test.
-        if (glEnv->Init(&argc, (char **)argv, CL_FALSE))
-        {
-            log_error(
-                "Failed to initialize the GL environment for this test.\n");
-            return -1;
-        }
-
         // Create a context to use and then grab a device (or devices) from it
         sCurrentContext = glEnv->CreateCLContext();
         if (sCurrentContext == NULL)
@@ -330,22 +329,12 @@ int main(int argc, const char *argv[])
         // Clean-up.
         free(deviceIDs);
         clReleaseContext(sCurrentContext);
-        // delete glEnv;
     }
 
     // OpenGL 3.2 tests.
     // ////////////////////////////////////////////////////////
-    if ((argc == 1) || first_32_testname)
+    if ((argc  == 1) || first_32_testname)
     {
-
-        // At least one device supports CL-GL interop, so init the test.
-        if (glEnv->Init(&argc, (char **)argv, CL_TRUE))
-        {
-            log_error(
-                "Failed to initialize the GL environment for this test.\n");
-            return -1;
-        }
-
         // Create a context to use and then grab a device (or devices) from it
         sCurrentContext = glEnv->CreateCLContext();
         if (sCurrentContext == NULL)
@@ -415,9 +404,10 @@ int main(int argc, const char *argv[])
         // Clean-up.
         free(deviceIDs);
         clReleaseContext(sCurrentContext);
-        delete glEnv;
     }
 
+    delete glEnv;
+
     // All done.
     return numErrors;
 }
diff --git a/test_conformance/gles/main.cpp b/test_conformance/gles/main.cpp
index 0327b70e10..b7ab0fed35 100644
--- a/test_conformance/gles/main.cpp
+++ b/test_conformance/gles/main.cpp
@@ -171,16 +171,16 @@ int main(int argc, const char *argv[])
     goto cleanup;
   }
 
+  // At least one device supports CL-GL interop, so init the test.
+  if( glEnv->Init( &argc, (char **)argv, CL_FALSE ) ) {
+    log_error("Failed to initialize the GL environment for this test.\n");
+    error = -1;
+    goto cleanup;
+  }
+
   // OpenGL tests for non-3.2 ////////////////////////////////////////////////////////
   if ((argc == 1) || (first_32_testname != 1)) {
 
-    // At least one device supports CL-GL interop, so init the test.
-    if( glEnv->Init( &argc, (char **)argv, CL_FALSE ) ) {
-      log_error("Failed to initialize the GL environment for this test.\n");
-      error = -1;
-      goto cleanup;
-    }
-
     // Create a context to use and then grab a device (or devices) from it
     sCurrentContext = glEnv->CreateCLContext();
     if( sCurrentContext == NULL )
@@ -279,19 +279,10 @@ int main(int argc, const char *argv[])
       // We move this to a common cleanup step to make sure that things will be released properly before the test exit
       goto cleanup;
       // clReleaseContext( sCurrentContext );
-      // delete glEnv;
   }
 
   // OpenGL 3.2 tests. ////////////////////////////////////////////////////////
   if ((argc==1) || first_32_testname) {
-
-    // At least one device supports CL-GL interop, so init the test.
-    if( glEnv->Init( &argc, (char **)argv, CL_TRUE ) ) {
-      log_error("Failed to initialize the GL environment for this test.\n");
-      error = -1;
-      goto cleanup;
-    }
-
     // Create a context to use and then grab a device (or devices) from it
     sCurrentContext = glEnv->CreateCLContext();
     if( sCurrentContext == NULL ) {