diff --git a/src/java/org/lwjgl/test/input/HWCursorTest.java b/src/java/org/lwjgl/test/input/HWCursorTest.java
index fa644c79..cc51c4b8 100644
--- a/src/java/org/lwjgl/test/input/HWCursorTest.java
+++ b/src/java/org/lwjgl/test/input/HWCursorTest.java
@@ -279,7 +279,8 @@ public class HWCursorTest {
     mouse_y = Mouse.getY();
 
     while(Mouse.next()) {
-      if(Mouse.getEventButtonState() && Mouse.getEventButton() < 3) {
+	int button = Mouse.getEventButton();
+      if(button >= 0 && button < 3 && Mouse.getEventButtonState()) {
         mouse_btn = Mouse.getEventButton();
       }
     }
diff --git a/src/java/org/lwjgl/test/input/MouseTest.java b/src/java/org/lwjgl/test/input/MouseTest.java
index 28f80a62..5ce63355 100644
--- a/src/java/org/lwjgl/test/input/MouseTest.java
+++ b/src/java/org/lwjgl/test/input/MouseTest.java
@@ -240,7 +240,7 @@ public class MouseTest {
   private void readBufferedMouse() {
     // iterate all events, use the last button down
     while(Mouse.next()) {
-      if(Mouse.getEventButtonState()) {
+      if(Mouse.getEventButton() != -1 && Mouse.getEventButtonState()) {
         lastButton = Mouse.getEventButton();
       }
     }