diff --git a/modules/egl/teglCreateContextExtTests.cpp b/modules/egl/teglCreateContextExtTests.cpp
index 93e848da2d..c02f5d2ef0 100644
--- a/modules/egl/teglCreateContextExtTests.cpp
+++ b/modules/egl/teglCreateContextExtTests.cpp
@@ -266,8 +266,9 @@ glu::ContextType attribListToContextType(EGLenum api, const EGLint *attribList)
             iter += 2;
             break;
 
-        default:
-            DE_ASSERT(false);
+        default: // Ignore any others
+            iter += 2;
+            break;
         }
     }
 
@@ -361,8 +362,10 @@ void CreateContextExtCase::logAttribList(void)
             iter++;
             break;
 
-        default:
-            DE_ASSERT(false);
+        default: 
+            m_testCtx.getLog() << TestLog::Message << "Unexpected EGL attrib found in logAttribList of value: " << *iter << TestLog::EndMessage;
+            iter += 2;
+            break;
         }
     }
 
@@ -430,7 +433,9 @@ void CreateContextExtCase::checkRequiredExtensions(void)
                 break;
 
             default:
-                DE_ASSERT(false);
+                m_testCtx.getLog() << TestLog::Message << "Unexpected EGL attrib found during checkRequiredExtensions of value: " << *iter << TestLog::EndMessage;
+                iter += 2;
+                break;
             }
         }
     }
@@ -736,7 +741,8 @@ bool CreateContextExtCase::validateCurrentContext(const glw::Functions &gl)
             break;
 
         default:
-            DE_ASSERT(false);
+            isOk = false;
+            break;
         }
     }