diff --git a/src/tests/kits/opengl/glinfo/GLInfo.cpp b/src/tests/kits/opengl/glinfo/GLInfo.cpp
index cfa8c83af8..4f01f86f40 100644
--- a/src/tests/kits/opengl/glinfo/GLInfo.cpp
+++ b/src/tests/kits/opengl/glinfo/GLInfo.cpp
@@ -70,7 +70,7 @@ GLInfoWindow::GLInfoWindow(BRect frame)
 	
 	LockLooper();
 	
-	// gl->LockGL();
+	gl->LockGL();
 	
 	list->AddItem(new BStringItem("OpenGL", 0));
 
@@ -135,7 +135,7 @@ GLInfoWindow::GLInfoWindow(BRect frame)
 	list->AddItem(new BStringItem(l.String(), 1));
 #endif
 
-	// gl->UnlockGL();
+	gl->UnlockGL();
 
 	UnlockLooper();
 }
diff --git a/src/tests/kits/opengl/glinfo/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile
index a3532032ee..8729ac3052 100644
--- a/src/tests/kits/opengl/glinfo/Jamfile
+++ b/src/tests/kits/opengl/glinfo/Jamfile
@@ -1,5 +1,14 @@
 SubDir HAIKU_TOP src tests kits opengl glinfo ;
 
+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 ;
+}
+
 SimpleTest GLInfo :
 	GLInfo.cpp
 	: be libGL.so