diff --git a/src/tests/kits/opengl/demos/gears/Jamfile b/src/tests/kits/opengl/demos/gears/Jamfile
index eddc768c0f..8f079b0427 100644
--- a/src/tests/kits/opengl/demos/gears/Jamfile
+++ b/src/tests/kits/opengl/demos/gears/Jamfile
@@ -1,26 +1,23 @@
 SubDir HAIKU_TOP src tests kits opengl demos gears ;
 UseBuildFeatureHeaders mesa ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-if $(TARGET_PLATFORM) != haiku {
-	# Needed for <GL/glut.h>, not present in R5.
-	# Unfortunately we also get the other headers there,
-	# that we don't really want.
-	UsePublicHeaders opengl ;
-}
-
+UseBuildFeatureHeaders glu ;
+UseLibraryHeaders glut ;
 
 local sources =
 	gears.c
 ;
 
-Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute mesa : headers ] ;
+Includes [ FGristFiles $(sources) ]
+	:
+	[ BuildFeatureAttribute mesa : headers ]
+	[ BuildFeatureAttribute glu : headers ]
+;
 
 
 SimpleTest GLGears :
 	$(sources)
 	:
-	be
+	be libglut.so
 	[ BuildFeatureAttribute mesa : library ]
+	[ BuildFeatureAttribute glu : library ]
 ;