diff --git a/intern/cycles/util/util_opencl.cpp b/intern/cycles/util/util_opencl.cpp
index 40b637f5cb7..c146c14b10c 100644
--- a/intern/cycles/util/util_opencl.cpp
+++ b/intern/cycles/util/util_opencl.cpp
@@ -140,6 +140,10 @@ int clLibraryInit()
 #endif
 	int error = 0;
 
+	// OpenCL disabled for now, only works with this environment variable set
+	if(!getenv("CYCLES_OPENCL_TEST"))
+		return 0;
+
 	//  Check if already initialized
 	if (module != NULL)
 	{