diff --git a/src/java/org/lwjgl/test/input/MouseCreationTest.java b/src/java/org/lwjgl/test/input/MouseCreationTest.java
index 60c91d1e..f4b839dc 100644
--- a/src/java/org/lwjgl/test/input/MouseCreationTest.java
+++ b/src/java/org/lwjgl/test/input/MouseCreationTest.java
@@ -201,22 +201,26 @@ public class MouseCreationTest {
 	private void render() {
 		gl.clear(GL.COLOR_BUFFER_BIT);
 
-		gl.pushMatrix();
-		gl.begin(GL.POLYGON);
-		{
-			gl.color3f(0.0f, 1.0f, 1.0f);
-			gl.vertex2f(position.x + 0.0f, position.y + 0.0f);
-
-			gl.color3f(1.0f, 0.0f, 1.0f);
-			gl.vertex2f(position.x + 0.0f, position.y + 30.0f);
-			gl.vertex2f(position.x + 40.0f, position.y + 30.0f);
-
-			gl.color3f(1.0f, 1.0f, 0.0f);
-			gl.vertex2f(position.x + 60.0f, position.y + 15.f);
-			gl.vertex2f(position.x + 40.0f, position.y + 0.0f);
-		}
-		gl.end();
-		gl.popMatrix();
+    gl.begin(GL.POLYGON);
+    {
+      float color = 1.0f;
+      int buttonDown = 0;
+      
+      for(int i=0;i<Mouse.buttonCount; i++) {
+        if(Mouse.isButtonDown(i)) {
+          color = (1.0f / Mouse.buttonCount) * (i+1); 
+          break; 
+        }
+      }
+      gl.color3f(color, color, color);
+      
+      gl.vertex2f(position.x + 0.0f, position.y + 0.0f);
+      gl.vertex2f(position.x + 0.0f, position.y + 30.0f);
+      gl.vertex2f(position.x + 40.0f, position.y + 30.0f);
+      gl.vertex2f(position.x + 60.0f, position.y + 15.f);
+      gl.vertex2f(position.x + 40.0f, position.y + 0.0f);
+    }
+    gl.end();
 	}
 
 	/**
diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java
index 6aba7c5a..89a8126c 100644
--- a/src/java/org/lwjgl/test/input/MouseTest.java
+++ b/src/java/org/lwjgl/test/input/MouseTest.java
@@ -168,22 +168,26 @@ public class MouseTest {
   private void render() {
     gl.clear(GL.COLOR_BUFFER_BIT);
 
-    gl.pushMatrix();
     gl.begin(GL.POLYGON);
     {
-      gl.color3f(0.0f, 1.0f, 1.0f);
+      float color = 1.0f;
+      int buttonDown = 0;
+      
+      for(int i=0;i<Mouse.buttonCount; i++) {
+        if(Mouse.isButtonDown(i)) {
+          color = (1.0f / Mouse.buttonCount) * (i+1); 
+          break; 
+        }
+      }
+      gl.color3f(color, color, color);
+      
       gl.vertex2f(position.x + 0.0f, position.y + 0.0f);
-
-      gl.color3f(1.0f, 0.0f, 1.0f);
       gl.vertex2f(position.x + 0.0f, position.y + 30.0f);
       gl.vertex2f(position.x + 40.0f, position.y + 30.0f);
-
-      gl.color3f(1.0f, 1.0f, 0.0f);
       gl.vertex2f(position.x + 60.0f, position.y + 15.f);
       gl.vertex2f(position.x + 40.0f, position.y + 0.0f);
     }
     gl.end();
-    gl.popMatrix();
   }
 
   /**