diff --git a/modules/egl/teglSyncTests.cpp b/modules/egl/teglSyncTests.cpp
index c48b587..97bc654 100644
--- a/modules/egl/teglSyncTests.cpp
+++ b/modules/egl/teglSyncTests.cpp
@@ -81,7 +81,7 @@
 		EXTENSION_FENCE_SYNC		= (0x1 << 1),
 		EXTENSION_REUSABLE_SYNC		= (0x1 << 2)
 	};
-									SyncTest	(EglTestContext& eglTestCtx, EGLenum syncType, Extension extensions, const char* name, const char* description);
+									SyncTest	(EglTestContext& eglTestCtx, EGLenum syncType, Extension extensions, bool useCurrentContext, const char* name, const char* description);
 									~SyncTest	(void);
 
 	void							init		(void);
@@ -90,6 +90,7 @@
 protected:
 	const EGLenum					m_syncType;
 	const Extension					m_extensions;
+	const bool						m_useCurrentContext;
 
 	glw::Functions					m_gl;
 
@@ -101,15 +102,16 @@
 	EGLSyncKHR						m_sync;
 };
 
-SyncTest::SyncTest (EglTestContext& eglTestCtx, EGLenum syncType, Extension extensions, const char* name, const char* description)
-	: TestCase			(eglTestCtx, name, description)
-	, m_syncType		(syncType)
-	, m_extensions		(extensions)
-	, m_eglDisplay		(EGL_NO_DISPLAY)
-	, m_eglSurface		(EGL_NO_SURFACE)
-	, m_nativeWindow	(DE_NULL)
-	, m_eglContext		(EGL_NO_CONTEXT)
-	, m_sync			(EGL_NO_SYNC_KHR)
+SyncTest::SyncTest (EglTestContext& eglTestCtx, EGLenum syncType, Extension extensions,  bool useCurrentContext, const char* name, const char* description)
+	: TestCase				(eglTestCtx, name, description)
+	, m_syncType			(syncType)
+	, m_extensions			(extensions)
+	, m_useCurrentContext	(useCurrentContext)
+	, m_eglDisplay			(EGL_NO_DISPLAY)
+	, m_eglSurface			(EGL_NO_SURFACE)
+	, m_nativeWindow		(DE_NULL)
+	, m_eglContext			(EGL_NO_CONTEXT)
+	, m_sync				(EGL_NO_SYNC_KHR)
 {
 }
 
@@ -209,18 +211,21 @@
 		requiredEGLExtensions(egl, m_eglDisplay, (Extension)(m_extensions | syncTypeExtension));
 	}
 
-	// Create context
-	EGLU_CHECK_CALL(egl, bindAPI(EGL_OPENGL_ES_API));
-	m_eglContext = egl.createContext(m_eglDisplay, m_eglConfig, EGL_NO_CONTEXT, contextAttribList);
-	EGLU_CHECK_MSG(egl, "Failed to create GLES2 context");
+	if (m_useCurrentContext)
+	{
+		// Create context
+		EGLU_CHECK_CALL(egl, bindAPI(EGL_OPENGL_ES_API));
+		m_eglContext = egl.createContext(m_eglDisplay, m_eglConfig, EGL_NO_CONTEXT, contextAttribList);
+		EGLU_CHECK_MSG(egl, "Failed to create GLES2 context");
 
-	// Create surface
-	m_nativeWindow = windowFactory.createWindow(&m_eglTestCtx.getNativeDisplay(), m_eglDisplay, m_eglConfig, DE_NULL, eglu::WindowParams(480, 480, eglu::parseWindowVisibility(m_testCtx.getCommandLine())));
-	m_eglSurface = eglu::createWindowSurface(m_eglTestCtx.getNativeDisplay(), *m_nativeWindow, m_eglDisplay, m_eglConfig, DE_NULL);
+		// Create surface
+		m_nativeWindow = windowFactory.createWindow(&m_eglTestCtx.getNativeDisplay(), m_eglDisplay, m_eglConfig, DE_NULL, eglu::WindowParams(480, 480, eglu::parseWindowVisibility(m_testCtx.getCommandLine())));
+		m_eglSurface = eglu::createWindowSurface(m_eglTestCtx.getNativeDisplay(), *m_nativeWindow, m_eglDisplay, m_eglConfig, DE_NULL);
 
-	EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext));
+		EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext));
 
-	requiredGLESExtensions(m_gl);
+		requiredGLESExtensions(m_gl);
+	}
 }
 
 void SyncTest::deinit (void)
@@ -260,7 +265,10 @@
 class CreateNullAttribsTest : public SyncTest
 {
 public:
-					CreateNullAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_null_attribs", "create_null_attribs") {}
+					CreateNullAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "create_null_attribs", "create_null_attribs")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -279,7 +287,10 @@
 class CreateEmptyAttribsTest : public SyncTest
 {
 public:
-					CreateEmptyAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_empty_attribs", "create_empty_attribs") {}
+					CreateEmptyAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "create_empty_attribs", "create_empty_attribs")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -303,7 +314,10 @@
 class CreateInvalidDisplayTest : public SyncTest
 {
 public:
-					CreateInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_invalid_display", "create_invalid_display") {}
+					CreateInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "create_invalid_display", "create_invalid_display")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -333,7 +347,10 @@
 class CreateInvalidTypeTest : public SyncTest
 {
 public:
-					CreateInvalidTypeTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_invalid_type", "create_invalid_type") {}
+					CreateInvalidTypeTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "create_invalid_type", "create_invalid_type")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -363,7 +380,10 @@
 class CreateInvalidAttribsTest : public SyncTest
 {
 public:
-					CreateInvalidAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_invalid_attribs", "create_invalid_attribs") {}
+					CreateInvalidAttribsTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "create_invalid_attribs", "create_invalid_attribs")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -398,7 +418,10 @@
 class CreateInvalidContextTest : public SyncTest
 {
 public:
-					CreateInvalidContextTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "create_invalid_context", "create_invalid_context") {}
+					CreateInvalidContextTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "create_invalid_context", "create_invalid_context")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -431,7 +454,10 @@
 class ClientWaitNoTimeoutTest : public SyncTest
 {
 public:
-					ClientWaitNoTimeoutTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_no_timeout", "wait_no_timeout") {}
+					ClientWaitNoTimeoutTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR,  "wait_no_timeout", "wait_no_timeout")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -461,7 +487,10 @@
 class ClientWaitForeverTest : public SyncTest
 {
 public:
-					ClientWaitForeverTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_forever", "wait_forever") {}
+					ClientWaitForeverTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+	: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "wait_forever", "wait_forever")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -500,7 +529,10 @@
 class ClientWaitNoContextTest : public SyncTest
 {
 public:
-					ClientWaitNoContextTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_no_context", "wait_no_Context") {}
+					ClientWaitNoContextTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "wait_no_context", "wait_no_Context")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -542,7 +574,10 @@
 class ClientWaitForeverFlushTest : public SyncTest
 {
 public:
-					ClientWaitForeverFlushTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_forever_flush", "wait_forever_flush") {}
+					ClientWaitForeverFlushTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "wait_forever_flush", "wait_forever_flush")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -573,7 +608,10 @@
 class ClientWaitInvalidDisplayTest : public SyncTest
 {
 public:
-					ClientWaitInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_invalid_display", "wait_invalid_display") {}
+					ClientWaitInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "wait_invalid_display", "wait_invalid_display")
+	{
+	}
 
 	IterateResult	iterate							(void)
 	{
@@ -607,7 +645,10 @@
 class ClientWaitInvalidSyncTest : public SyncTest
 {
 public:
-					ClientWaitInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "wait_invalid_sync", "wait_invalid_sync") {}
+					ClientWaitInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "wait_invalid_sync", "wait_invalid_sync")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -637,7 +678,10 @@
 class GetSyncTypeTest : public SyncTest
 {
 public:
-					GetSyncTypeTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_type", "get_type") {}
+					GetSyncTypeTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "get_type", "get_type")
+	{
+	}
 
 	IterateResult	iterate			(void)
 	{
@@ -662,7 +706,10 @@
 class GetSyncStatusTest : public SyncTest
 {
 public:
-					GetSyncStatusTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_status", "get_status") {}
+					GetSyncStatusTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "get_status", "get_status")
+	{
+	}
 
 	IterateResult	iterate				(void)
 	{
@@ -690,7 +737,10 @@
 class GetSyncStatusSignaledTest : public SyncTest
 {
 public:
-					GetSyncStatusSignaledTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_status_signaled", "get_status_signaled") {}
+					GetSyncStatusSignaledTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "get_status_signaled", "get_status_signaled")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -735,7 +785,10 @@
 class GetSyncConditionTest : public SyncTest
 {
 public:
-					GetSyncConditionTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_condition", "get_condition") {}
+					GetSyncConditionTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "get_condition", "get_condition")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -760,7 +813,10 @@
 class GetSyncInvalidDisplayTest : public SyncTest
 {
 public:
-					GetSyncInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_invalid_display", "get_invalid_display") {}
+					GetSyncInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"get_invalid_display", "get_invalid_display")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -796,7 +852,10 @@
 class GetSyncInvalidSyncTest : public SyncTest
 {
 public:
-					GetSyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_invalid_sync", "get_invalid_sync") {}
+					GetSyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)\
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, syncType != EGL_SYNC_REUSABLE_KHR, "get_invalid_sync", "get_invalid_sync")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -828,7 +887,10 @@
 class GetSyncInvalidAttributeTest : public SyncTest
 {
 public:
-					GetSyncInvalidAttributeTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_invalid_attribute", "get_invalid_attribute") {}
+					GetSyncInvalidAttributeTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"get_invalid_attribute", "get_invalid_attribute")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -864,7 +926,10 @@
 class GetSyncInvalidValueTest : public SyncTest
 {
 public:
-					GetSyncInvalidValueTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "get_invalid_value", "get_invalid_value") {}
+					GetSyncInvalidValueTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"get_invalid_value", "get_invalid_value")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -898,7 +963,10 @@
 class DestroySyncTest : public SyncTest
 {
 public:
-					DestroySyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "destroy", "destroy") {}
+					DestroySyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"destroy", "destroy")
+	{
+	}
 
 	IterateResult	iterate			(void)
 	{
@@ -921,7 +989,10 @@
 class DestroySyncInvalidDislayTest : public SyncTest
 {
 public:
-					DestroySyncInvalidDislayTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "destroy_invalid_display", "destroy_invalid_display") {}
+					DestroySyncInvalidDislayTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"destroy_invalid_display", "destroy_invalid_display")
+	{
+	}
 
 	IterateResult	iterate							(void)
 	{
@@ -955,7 +1026,10 @@
 class DestroySyncInvalidSyncTest : public SyncTest
 {
 public:
-					DestroySyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_NONE, "destroy_invalid_sync", "destroy_invalid_sync") {}
+					DestroySyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_NONE,  syncType != EGL_SYNC_REUSABLE_KHR,"destroy_invalid_sync", "destroy_invalid_sync")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -985,7 +1059,10 @@
 class WaitSyncTest : public SyncTest
 {
 public:
-					WaitSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, "wait_server", "wait_server") {}
+					WaitSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, true, "wait_server", "wait_server")
+	{
+	}
 
 	IterateResult	iterate			(void)
 	{
@@ -1012,7 +1089,10 @@
 class WaitSyncInvalidDisplayTest : public SyncTest
 {
 public:
-					WaitSyncInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, "wait_server_invalid_display", "wait_server_invalid_display") {}
+					WaitSyncInvalidDisplayTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, true, "wait_server_invalid_display", "wait_server_invalid_display")
+	{
+	}
 
 	IterateResult	iterate						(void)
 	{
@@ -1046,7 +1126,10 @@
 class WaitSyncInvalidSyncTest : public SyncTest
 {
 public:
-					WaitSyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, "wait_server_invalid_sync", "wait_server_invalid_sync") {}
+					WaitSyncInvalidSyncTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, true, "wait_server_invalid_sync", "wait_server_invalid_sync")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{
@@ -1076,7 +1159,10 @@
 class WaitSyncInvalidFlagTest : public SyncTest
 {
 public:
-					WaitSyncInvalidFlagTest	(EglTestContext& eglTestCtx, EGLenum syncType) : SyncTest(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, "wait_server_invalid_flag", "wait_server_invalid_flag") {}
+					WaitSyncInvalidFlagTest	(EglTestContext& eglTestCtx, EGLenum syncType)
+		: SyncTest	(eglTestCtx, syncType, SyncTest::EXTENSION_WAIT_SYNC, true, "wait_server_invalid_flag", "wait_server_invalid_flag")
+	{
+	}
 
 	IterateResult	iterate					(void)
 	{