diff --git a/displacement/displacement.cpp b/displacement/displacement.cpp
index 3112665c..f833681b 100644
--- a/displacement/displacement.cpp
+++ b/displacement/displacement.cpp
@@ -108,9 +108,9 @@ public:
 	// Enable physical device features required for this example				
 	virtual void getEnabledFeatures()
 	{
-		// Geometry shader support is required for this example
-		if (deviceFeatures.fillModeNonSolid) {
-			enabledFeatures.geometryShader = VK_TRUE;
+		// Tessellation shader support is required for this example
+		if (deviceFeatures.tessellationShader) {
+			enabledFeatures.tessellationShader = VK_TRUE;
 		}
 		else {
 			vks::tools::exitFatal("Selected GPU does not support tessellation shaders!", "Feature not supported");
diff --git a/geometryshader/geometryshader.cpp b/geometryshader/geometryshader.cpp
index 0cbe5f2b..04dd2d53 100644
--- a/geometryshader/geometryshader.cpp
+++ b/geometryshader/geometryshader.cpp
@@ -98,7 +98,7 @@ public:
 	virtual void getEnabledFeatures()
 	{
 		// Geometry shader support is required for this example
-		if (deviceFeatures.fillModeNonSolid) {
+		if (deviceFeatures.geometryShader) {
 			enabledFeatures.geometryShader = VK_TRUE;
 		}
 		else {