diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d55c8a04dc..36f6edd7a3 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -69,14 +69,14 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bfsinfo
 
 SYSTEM_APPS = AboutSystem ActivityMonitor $(X86_ONLY)BootManager CharacterMap
 	CodyCam DeskCalc Devices DiskProbe DiskUsage DriveSetup CDPlayer Expander
-	Icon-O-Matic Installer LaunchBox Magnify Mail MediaConverter MediaPlayer
-	MidiPlayer NetworkStatus PackageInstaller People PoorMan PowerStatus
-	ProcessController Screenshot ShowImage SoundRecorder StyledEdit Terminal
-	TextSearch TV WebWatch Workspaces
+	$(X86_ONLY)GLInfo Icon-O-Matic Installer LaunchBox Magnify Mail
+	MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
+	PoorMan PowerStatus ProcessController Screenshot ShowImage SoundRecorder
+	StyledEdit Terminal TextSearch TV WebWatch Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
 	<preference>Deskbar E-mail FileTypes Keyboard Keymap Locale Media
-	Mouse Network Notifications $(X86_ONLY)3DRendering Printers Screen ScreenSaver
+	Mouse Network Notifications Printers Screen ScreenSaver
 	Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index f346574b06..99c59fb3c8 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -18,7 +18,6 @@ SubInclude HAIKU_TOP src preferences media ;
 SubInclude HAIKU_TOP src preferences mouse ;
 SubInclude HAIKU_TOP src preferences network ;
 SubInclude HAIKU_TOP src preferences notifications ;
-SubInclude HAIKU_TOP src preferences 3drendering ;
 SubInclude HAIKU_TOP src preferences printers ;
 SubInclude HAIKU_TOP src preferences screen ;
 SubInclude HAIKU_TOP src preferences screensaver ;
diff --git a/src/tests/kits/opengl/Jamfile b/src/tests/kits/opengl/Jamfile
index 2cd7ad19d7..a5acb00677 100644
--- a/src/tests/kits/opengl/Jamfile
+++ b/src/tests/kits/opengl/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src tests kits opengl ;
 
 SubInclude HAIKU_TOP src tests kits opengl direct_mode ;
 SubInclude HAIKU_TOP src tests kits opengl demos ;
+SubInclude HAIKU_TOP src tests kits opengl glinfo ;
 SubInclude HAIKU_TOP src tests kits opengl glut ;
 SubInclude HAIKU_TOP src tests kits opengl glsl ;
 
diff --git a/src/preferences/3drendering/CapabilitiesView.cpp b/src/tests/kits/opengl/glinfo/CapabilitiesView.cpp
similarity index 100%
rename from src/preferences/3drendering/CapabilitiesView.cpp
rename to src/tests/kits/opengl/glinfo/CapabilitiesView.cpp
diff --git a/src/preferences/3drendering/CapabilitiesView.h b/src/tests/kits/opengl/glinfo/CapabilitiesView.h
similarity index 100%
rename from src/preferences/3drendering/CapabilitiesView.h
rename to src/tests/kits/opengl/glinfo/CapabilitiesView.h
diff --git a/src/preferences/3drendering/ExtensionsView.cpp b/src/tests/kits/opengl/glinfo/ExtensionsView.cpp
similarity index 100%
rename from src/preferences/3drendering/ExtensionsView.cpp
rename to src/tests/kits/opengl/glinfo/ExtensionsView.cpp
diff --git a/src/preferences/3drendering/ExtensionsView.h b/src/tests/kits/opengl/glinfo/ExtensionsView.h
similarity index 100%
rename from src/preferences/3drendering/ExtensionsView.h
rename to src/tests/kits/opengl/glinfo/ExtensionsView.h
diff --git a/src/preferences/3drendering/3DRendering.rdef b/src/tests/kits/opengl/glinfo/GLInfo.rdef
similarity index 81%
rename from src/preferences/3drendering/3DRendering.rdef
rename to src/tests/kits/opengl/glinfo/GLInfo.rdef
index 5ba080c6b4..2e5676bb1f 100644
--- a/src/preferences/3drendering/3DRendering.rdef
+++ b/src/tests/kits/opengl/glinfo/GLInfo.rdef
@@ -1,22 +1,22 @@
 
-resource app_signature "application/x-vnd.Haiku-3DRendering";
+resource app_signature "application/x-vnd.Haiku-GLInfo";
 
-resource app_name_catalog_entry "x-vnd.Haiku-3DRendering:System name:3D Rendering";
+resource app_name_catalog_entry "x-vnd.Haiku-GLInfo:System name:GL Info";
 
 resource(1, "gears_64.png") #'PNG ' import "gears_64.png";
 
 resource app_flags B_SINGLE_LAUNCH;
 
 resource app_version {
-	major  = 1,
+	major  = 2,
 	middle = 0,
 	minor  = 0,
 
 	variety = B_APPV_DEVELOPMENT,
 	internal = 0,
 
-	short_info = "3D Rendering",
-	long_info = "3D Rendering ©2009-2012 Haiku, Inc."
+	short_info = "GL Info",
+	long_info = "GL Info ©2009-2012 Haiku, Inc."
 };
 
 resource vector_icon {
diff --git a/src/preferences/3drendering/GearsView.cpp b/src/tests/kits/opengl/glinfo/GearsView.cpp
similarity index 100%
rename from src/preferences/3drendering/GearsView.cpp
rename to src/tests/kits/opengl/glinfo/GearsView.cpp
diff --git a/src/preferences/3drendering/GearsView.h b/src/tests/kits/opengl/glinfo/GearsView.h
similarity index 100%
rename from src/preferences/3drendering/GearsView.h
rename to src/tests/kits/opengl/glinfo/GearsView.h
diff --git a/src/preferences/3drendering/InfoView.cpp b/src/tests/kits/opengl/glinfo/InfoView.cpp
similarity index 100%
rename from src/preferences/3drendering/InfoView.cpp
rename to src/tests/kits/opengl/glinfo/InfoView.cpp
diff --git a/src/preferences/3drendering/InfoView.h b/src/tests/kits/opengl/glinfo/InfoView.h
similarity index 100%
rename from src/preferences/3drendering/InfoView.h
rename to src/tests/kits/opengl/glinfo/InfoView.h
diff --git a/src/preferences/3drendering/Jamfile b/src/tests/kits/opengl/glinfo/Jamfile
similarity index 82%
rename from src/preferences/3drendering/Jamfile
rename to src/tests/kits/opengl/glinfo/Jamfile
index f49ef941bc..e02567ed5e 100644
--- a/src/preferences/3drendering/Jamfile
+++ b/src/tests/kits/opengl/glinfo/Jamfile
@@ -1,4 +1,5 @@
-SubDir HAIKU_TOP src preferences 3drendering ;
+SubDir HAIKU_TOP src tests kits opengl glinfo ;
+
 SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 # For GCC2
@@ -23,15 +24,15 @@ Includes [ FGristFiles $(sources) ] : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
 	# Dependency needed to trigger downloading/unzipping the package before
 	# compiling the files.
 
-Preference 3DRendering
+Preference GLInfo
 	: $(sources)
 	: be GL translation libcolumnlistview.a $(HAIKU_LOCALE_LIBS)
 		$(TARGET_LIBSUPC++)
-	: 3DRendering.rdef
+	: GLInfo.rdef
 ;
 
-DoCatalogs 3DRendering :
-    x-vnd.Haiku-3DRendering
+DoCatalogs GLInfo :
+    x-vnd.Haiku-GLInfo
 	:
 	CapabilitiesView.cpp
 	ExtensionsView.cpp
diff --git a/src/preferences/3drendering/OpenGLApp.cpp b/src/tests/kits/opengl/glinfo/OpenGLApp.cpp
similarity index 89%
rename from src/preferences/3drendering/OpenGLApp.cpp
rename to src/tests/kits/opengl/glinfo/OpenGLApp.cpp
index 86d9801fd6..6073f07bb5 100644
--- a/src/preferences/3drendering/OpenGLApp.cpp
+++ b/src/tests/kits/opengl/glinfo/OpenGLApp.cpp
@@ -16,7 +16,7 @@
 
 OpenGLApp::OpenGLApp()
 	:
-	BApplication("application/x-vnd.Haiku-3DRendering")
+	BApplication("application/x-vnd.Haiku-GLInfo")
 {
 }
 
diff --git a/src/preferences/3drendering/OpenGLApp.h b/src/tests/kits/opengl/glinfo/OpenGLApp.h
similarity index 100%
rename from src/preferences/3drendering/OpenGLApp.h
rename to src/tests/kits/opengl/glinfo/OpenGLApp.h
diff --git a/src/preferences/3drendering/OpenGLView.cpp b/src/tests/kits/opengl/glinfo/OpenGLView.cpp
similarity index 100%
rename from src/preferences/3drendering/OpenGLView.cpp
rename to src/tests/kits/opengl/glinfo/OpenGLView.cpp
diff --git a/src/preferences/3drendering/OpenGLView.h b/src/tests/kits/opengl/glinfo/OpenGLView.h
similarity index 100%
rename from src/preferences/3drendering/OpenGLView.h
rename to src/tests/kits/opengl/glinfo/OpenGLView.h
diff --git a/src/preferences/3drendering/OpenGLWindow.cpp b/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
similarity index 94%
rename from src/preferences/3drendering/OpenGLWindow.cpp
rename to src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
index 00cfffdc40..a9e3e9ef07 100644
--- a/src/preferences/3drendering/OpenGLWindow.cpp
+++ b/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
@@ -24,7 +24,7 @@
 OpenGLWindow::OpenGLWindow()
 	:
 	BWindow(BRect(50, 50, 300, 300),
-		B_TRANSLATE_SYSTEM_NAME("3D Rendering"), B_TITLED_WINDOW,
+		B_TRANSLATE_SYSTEM_NAME("GL Info"), B_TITLED_WINDOW,
 		B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
 		| B_AUTO_UPDATE_SIZE_LIMITS)
 {
diff --git a/src/preferences/3drendering/OpenGLWindow.h b/src/tests/kits/opengl/glinfo/OpenGLWindow.h
similarity index 100%
rename from src/preferences/3drendering/OpenGLWindow.h
rename to src/tests/kits/opengl/glinfo/OpenGLWindow.h
diff --git a/src/preferences/3drendering/gears_64.png b/src/tests/kits/opengl/glinfo/gears_64.png
similarity index 100%
rename from src/preferences/3drendering/gears_64.png
rename to src/tests/kits/opengl/glinfo/gears_64.png