diff --git a/src/tests/kits/opengl/glsl/Jamfile b/src/tests/kits/opengl/glsl/Jamfile
index cdac47678f..75159f0055 100644
--- a/src/tests/kits/opengl/glsl/Jamfile
+++ b/src/tests/kits/opengl/glsl/Jamfile
@@ -1,21 +1,17 @@
 SubDir HAIKU_TOP src tests kits opengl glsl ;
 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 shadersources =
 	shaderutil.c
 ;
 
 Includes [ FGristFiles $(shadersources) ]
-	: [ BuildFeatureAttribute mesa : headers ] ;
+	:
+	[ BuildFeatureAttribute mesa : headers ]
+	[ BuildFeatureAttribute glu : headers ]
+;
 
 StaticLibrary libshaderutil.a :
 	$(shadersources)
@@ -24,6 +20,7 @@ StaticLibrary libshaderutil.a :
 SimpleTest brick :
 	brick.c
 	:
-	libshaderutil.a be
+	libshaderutil.a be libglut.so
 	[ BuildFeatureAttribute mesa : library ]
+	[ BuildFeatureAttribute glu : library ]
 ;