diff --git a/test_conformance/clcpp/images/main.cpp b/test_conformance/clcpp/images/main.cpp
index 5cf221c8..846ff416 100644
--- a/test_conformance/clcpp/images/main.cpp
+++ b/test_conformance/clcpp/images/main.cpp
@@ -19,6 +19,10 @@
 #include "test_sample.hpp"
 #include "test_write.hpp"
 
+// FIXME: To use certain functions in test_common/harness/imageHelpers.h
+// (for example, generate_random_image_data()), the tests are required to declare
+// the following variable (hangover from code specific to Apple's implementation):
+cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT;
 
 int main(int argc, const char *argv[])
 {