diff --git a/test_conformance/images/kernel_read_write/CMakeLists.txt b/test_conformance/images/kernel_read_write/CMakeLists.txt
index d7b5f66a..95aec92a 100644
--- a/test_conformance/images/kernel_read_write/CMakeLists.txt
+++ b/test_conformance/images/kernel_read_write/CMakeLists.txt
@@ -2,6 +2,7 @@ set(MODULE_NAME IMAGE_STREAMS)
 
 set(${MODULE_NAME}_SOURCES
     main.cpp
+    test_common.cpp
     test_iterations.cpp
     test_loops.cpp
     test_read_1D.cpp
diff --git a/test_conformance/images/kernel_read_write/test_common.cpp b/test_conformance/images/kernel_read_write/test_common.cpp
new file mode 100644
index 00000000..5182601b
--- /dev/null
+++ b/test_conformance/images/kernel_read_write/test_common.cpp
@@ -0,0 +1,19 @@
+
+#include "test_common.h"
+
+cl_sampler create_sampler(cl_context context, image_sampler_data *sdata, bool test_mipmaps, cl_int *error) {
+    cl_sampler sampler = nullptr;
+    if (test_mipmaps) {
+        cl_sampler_properties properties[] = {
+            CL_SAMPLER_NORMALIZED_COORDS, sdata->normalized_coords,
+            CL_SAMPLER_ADDRESSING_MODE, sdata->addressing_mode,
+            CL_SAMPLER_FILTER_MODE, sdata->filter_mode,
+            CL_SAMPLER_MIP_FILTER_MODE, sdata->filter_mode,
+            0};
+        sampler = clCreateSamplerWithProperties(context, properties, error);
+    } else {
+        sampler = clCreateSampler(context, sdata->normalized_coords, sdata->addressing_mode, sdata->filter_mode, error);
+    }
+    return sampler;
+}
+
diff --git a/test_conformance/images/kernel_read_write/test_common.h b/test_conformance/images/kernel_read_write/test_common.h
new file mode 100644
index 00000000..9cacb1e6
--- /dev/null
+++ b/test_conformance/images/kernel_read_write/test_common.h
@@ -0,0 +1,5 @@
+
+#include "../testBase.h"
+
+extern cl_sampler create_sampler(cl_context context, image_sampler_data *sdata, bool test_mipmaps, cl_int *error);
+
diff --git a/test_conformance/images/kernel_read_write/test_iterations.cpp b/test_conformance/images/kernel_read_write/test_iterations.cpp
index 5de5f357..b0554509 100644
--- a/test_conformance/images/kernel_read_write/test_iterations.cpp
+++ b/test_conformance/images/kernel_read_write/test_iterations.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../testBase.h"
+#include "test_common.h"
 #include <float.h>
 
 #if defined( __APPLE__ )
@@ -1407,17 +1407,8 @@ int test_read_image_2D( cl_context context, cl_command_queue queue, cl_kernel ke
     test_error( error, "Unable to create result buffer" );
 
     // Create sampler to use
-    cl_sampler_properties properties[] = {
-        CL_SAMPLER_NORMALIZED_COORDS, imageSampler->normalized_coords,
-        CL_SAMPLER_ADDRESSING_MODE, imageSampler->addressing_mode,
-        CL_SAMPLER_FILTER_MODE, imageSampler->filter_mode,
-        0, 0, 0 };
-    if (gTestMipmaps) {
-        properties[6] = CL_SAMPLER_MIP_FILTER_MODE;
-        properties[7] = imageSampler->filter_mode;
-    }
-    actualSampler = clCreateSamplerWithProperties(context, properties, &error );
-    test_error( error, "Unable to create image sampler" );
+    actualSampler = create_sampler(context, imageSampler, gTestMipmaps, &error);
+    test_error(error, "Unable to create image sampler");
 
     // Set arguments
     int idx = 0;
diff --git a/test_conformance/images/kernel_read_write/test_read_1D.cpp b/test_conformance/images/kernel_read_write/test_read_1D.cpp
index 18572c87..e9f97340 100644
--- a/test_conformance/images/kernel_read_write/test_read_1D.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_1D.cpp
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../testBase.h"
+
+#include "test_common.h"
 #include <float.h>
 
 #if defined( __APPLE__ )
@@ -401,17 +402,8 @@ int test_read_image_1D( cl_context context, cl_command_queue queue, cl_kernel ke
     test_error( error, "Unable to create result buffer" );
 
     // Create sampler to use
-    cl_sampler_properties properties[] = {
-        CL_SAMPLER_NORMALIZED_COORDS, imageSampler->normalized_coords,
-        CL_SAMPLER_ADDRESSING_MODE, imageSampler->addressing_mode,
-        CL_SAMPLER_FILTER_MODE, imageSampler->filter_mode,
-        0, 0, 0 };
-    if (gTestMipmaps) {
-        properties[6] = CL_SAMPLER_MIP_FILTER_MODE;
-        properties[7] = imageSampler->filter_mode;
-    }
-    actualSampler = clCreateSamplerWithProperties(context, properties, &error );
-    test_error( error, "Unable to create image sampler" );
+    actualSampler = create_sampler(context, imageSampler, gTestMipmaps, &error);
+    test_error(error, "Unable to create image sampler");
 
     // Set arguments
     int idx = 0;
diff --git a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
index 91885eea..28971382 100644
--- a/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_1D_array.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../testBase.h"
+#include "test_common.h"
 #include <float.h>
 
 #if defined( __APPLE__ )
@@ -483,17 +483,8 @@ int test_read_image_1D_array( cl_context context, cl_command_queue queue, cl_ker
     test_error( error, "Unable to create result buffer" );
 
     // Create sampler to use
-    cl_sampler_properties properties[] = {
-        CL_SAMPLER_NORMALIZED_COORDS, imageSampler->normalized_coords,
-        CL_SAMPLER_ADDRESSING_MODE, imageSampler->addressing_mode,
-        CL_SAMPLER_FILTER_MODE, imageSampler->filter_mode,
-        0, 0, 0 };
-    if (gTestMipmaps) {
-        properties[6] = CL_SAMPLER_MIP_FILTER_MODE;
-        properties[7] = imageSampler->filter_mode;
-    }
-    actualSampler = clCreateSamplerWithProperties(context, properties, &error );
-    test_error( error, "Unable to create image sampler" );
+    actualSampler = create_sampler(context, imageSampler, gTestMipmaps, &error);
+    test_error(error, "Unable to create image sampler");
 
     // Set arguments
     int idx = 0;
diff --git a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
index ccfe7e88..e9212460 100644
--- a/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_2D_array.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../testBase.h"
+#include "test_common.h"
 #include <float.h>
 
 #define MAX_ERR 0.005f
@@ -490,17 +490,8 @@ int test_read_image_2D_array( cl_context context, cl_command_queue queue, cl_ker
     test_error( error, "Unable to create result buffer" );
 
     // Create sampler to use
-    cl_sampler_properties properties[] = {
-        CL_SAMPLER_NORMALIZED_COORDS, imageSampler->normalized_coords,
-        CL_SAMPLER_ADDRESSING_MODE, imageSampler->addressing_mode,
-        CL_SAMPLER_FILTER_MODE, imageSampler->filter_mode,
-        0, 0, 0 };
-    if (gTestMipmaps) {
-        properties[6] = CL_SAMPLER_MIP_FILTER_MODE;
-        properties[7] = imageSampler->filter_mode;
-    }
-    actualSampler = clCreateSamplerWithProperties(context, properties, &error );
-    test_error( error, "Unable to create image sampler" );
+    actualSampler = create_sampler(context, imageSampler, gTestMipmaps, &error);
+    test_error(error, "Unable to create image sampler");
 
     // Set arguments
     int idx = 0;
diff --git a/test_conformance/images/kernel_read_write/test_read_3D.cpp b/test_conformance/images/kernel_read_write/test_read_3D.cpp
index bca93702..fe375be9 100644
--- a/test_conformance/images/kernel_read_write/test_read_3D.cpp
+++ b/test_conformance/images/kernel_read_write/test_read_3D.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../testBase.h"
+#include "test_common.h"
 #include <float.h>
 
 #define MAX_ERR 0.005f
@@ -499,17 +499,8 @@ int test_read_image_3D( cl_context context, cl_command_queue queue, cl_kernel ke
     test_error( error, "Unable to create result buffer" );
 
     // Create sampler to use
-    cl_sampler_properties properties[] = {
-        CL_SAMPLER_NORMALIZED_COORDS, imageSampler->normalized_coords,
-        CL_SAMPLER_ADDRESSING_MODE, imageSampler->addressing_mode,
-        CL_SAMPLER_FILTER_MODE, imageSampler->filter_mode,
-        0, 0, 0 };
-    if (gTestMipmaps) {
-        properties[6] = CL_SAMPLER_MIP_FILTER_MODE;
-        properties[7] = imageSampler->filter_mode;
-    }
-    actualSampler = clCreateSamplerWithProperties(context, properties, &error );
-    test_error( error, "Unable to create image sampler" );
+    actualSampler = create_sampler(context, imageSampler, gTestMipmaps, &error);
+    test_error(error, "Unable to create image sampler");
 
     // Set arguments
     int idx = 0;