diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index eedeef7..1287e7a 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -148,15 +148,17 @@
 
 std::vector<const char *> PhysicalGpu::extensions() const
 {
+    // TODO : Should fill this out using GetGlobalExtensionInfo to query count
+    //   Then fill in extensions based on that count
     static const char *known_exts[] = {
         "VK_WSI_X11",
     };
 
     std::vector<const char *> exts;
     for (int i = 0; i < sizeof(known_exts) / sizeof(known_exts[0]); i++) {
-        VkResult err = vkGetExtensionSupport(gpu_, known_exts[i]);
-        if (err == VK_SUCCESS)
-            exts.push_back(known_exts[i]);
+//        VkResult err = vkGetExtensionSupport(gpu_, known_exts[i]);
+//        if (err == VK_SUCCESS)
+        exts.push_back(known_exts[i]);
     }
 
     return exts;
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index f036a88..285dd85 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -79,8 +79,7 @@
     // vkGetProcAddr()
     void *get_proc(const char *name) const { return vkGetProcAddr(gpu_, name); }
 
-    // vkGetExtensionSupport()
-    bool has_extension(const char *ext) const { return (vkGetExtensionSupport(gpu_, ext) == VK_SUCCESS); }
+    // vkGetGlobalExtensionInfo()
     std::vector<const char *> extensions() const;
 
     // vkEnumerateLayers()