diff --git a/test_conformance/printf/test_printf.c b/test_conformance/printf/test_printf.c
index 29f1babb..a3951bae 100644
--- a/test_conformance/printf/test_printf.c
+++ b/test_conformance/printf/test_printf.c
@@ -43,6 +43,8 @@
 #include "harness/mt19937.h"
 #include "harness/parseParameters.h"
 
+#include <CL/cl_ext.h>
+
 typedef  unsigned int uint32_t;
 
 
@@ -156,6 +158,14 @@ static void releaseOutputStream(int fd)
     close(fd);
 }
 
+//-----------------------------------------
+// printfCallBack
+//-----------------------------------------
+static void CL_CALLBACK printfCallBack(const char *printf_data, size_t len, size_t final, void *user_data)
+{
+    fwrite(printf_data, 1, len, stdout);
+}
+
 //-----------------------------------------
 // getAnalysisBuffer
 //-----------------------------------------
@@ -168,7 +178,7 @@ static void getAnalysisBuffer(char* analysisBuffer)
     if(NULL == fp)
         log_error("Failed to open analysis buffer ('%s')\n", strerror(errno));
     else
-    while(fgets(analysisBuffer,ANALYSIS_BUFFER_SIZE , fp) != NULL );
+        while(fgets(analysisBuffer, ANALYSIS_BUFFER_SIZE, fp) != NULL );
     fclose(fp);
 }
 
@@ -192,21 +202,11 @@ static int isKernelPFormat(testCase* pTestCase,size_t testId)
 //-----------------------------------------
 int waitForEvent(cl_event* event)
 {
-    cl_int status = CL_SUCCESS;
-    cl_int eventStatus = CL_QUEUED;
-    while(eventStatus != CL_COMPLETE)
+    cl_int status = clWaitForEvents(1, event);
+    if(status != CL_SUCCESS)
     {
-        status = clGetEventInfo(
-            *event,
-            CL_EVENT_COMMAND_EXECUTION_STATUS,
-            sizeof(cl_int),
-            &eventStatus,
-            NULL);
-        if(status != CL_SUCCESS)
-        {
-            log_error("clGetEventInfo failed");
-            return status;
-        }
+        log_error("clWaitForEvents failed");
+        return status;
     }
 
     status = clReleaseEvent(*event);
@@ -540,7 +540,7 @@ static int doTest(cl_command_queue queue, cl_context context, const unsigned int
         goto exit;
     }
     //Wait until kernel finishes its execution and (thus) the output printed from the kernel
-    //is immidatly printed
+    //is immediately printed
     err = waitForEvent(&ndrEvt);
 
     releaseOutputStream(fd);
@@ -587,9 +587,9 @@ exit:
     if(clReleaseProgram(program) != CL_SUCCESS)
         log_error("clReleaseProgram failed\n");
     if(d_out)
-	    clReleaseMemObject(d_out);
+        clReleaseMemObject(d_out);
     if(d_a)
-	    clReleaseMemObject(d_a);
+        clReleaseMemObject(d_a);
     ++s_test_cnt;
     return err;
 }
@@ -1076,7 +1076,21 @@ test_status InitCL( cl_device_id device )
 
     gFd = acquireOutputStream();
 
-    gContext = clCreateContext(NULL, 1, &device, notify_callback, NULL, NULL);
+    cl_context_properties printf_properties[] =
+        {
+            CL_PRINTF_CALLBACK_ARM, (cl_context_properties)printfCallBack,
+            CL_PRINTF_BUFFERSIZE_ARM, ANALYSIS_BUFFER_SIZE,
+            0
+        };
+
+    cl_context_properties* props = NULL;
+
+    if(is_extension_available(device, "cl_arm_printf"))
+    {
+        props = printf_properties;
+    }
+
+    gContext = clCreateContext(props, 1, &device, notify_callback, NULL, NULL);
     checkNull(gContext, "clCreateContext");
 
     gQueue = clCreateCommandQueueWithProperties(gContext, device, 0, NULL);