diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java
index 0aa6c892..0c26a769 100644
--- a/src/java/org/lwjgl/test/input/KeyboardTest.java
+++ b/src/java/org/lwjgl/test/input/KeyboardTest.java
@@ -148,6 +148,7 @@ public class KeyboardTest {
       int count = Keyboard.getNumKeyboardEvents();
       while (Keyboard.next()) {
         System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.getEventKey()));
+        System.out.println("Pressed:" + Keyboard.getEventKeyState());
         System.out.println("Key character: " + Keyboard.getEventCharacter());
         
         if (Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
diff --git a/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java b/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
index 33e30b01..5d6c4513 100644
--- a/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
+++ b/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
@@ -151,20 +151,25 @@ public class AWTInputAdapterTest extends Frame {
 					Keyboard.poll();
 				}
 				while (Keyboard.isCreated() && Keyboard.next()) {
-					if (Keyboard.getEventKeyState()) {
-						switch (Keyboard.getEventKey()) {
-							case Keyboard.KEY_ESCAPE:
-								System.exit(0);
-								break;
-							case Keyboard.KEY_H:
-								AWTInputAdapter.destroy();
-								break;
-							case Keyboard.KEY_G:
-								Mouse.setGrabbed(!Mouse.isGrabbed());
-								break;
-							default:
-								break;
-						}
+					if (Keyboard.getEventKey() != Keyboard.KEY_NONE) {
+						String key_name = Keyboard.getKeyName(Keyboard.getEventKey());
+						if (Keyboard.getEventKeyState()) {
+							switch (Keyboard.getEventKey()) {
+								case Keyboard.KEY_ESCAPE:
+									System.exit(0);
+									break;
+								case Keyboard.KEY_H:
+									AWTInputAdapter.destroy();
+									break;
+								case Keyboard.KEY_G:
+									Mouse.setGrabbed(!Mouse.isGrabbed());
+									break;
+								default:
+									break;
+							}
+							System.out.println("Pressed: " + key_name);
+						} else
+							System.out.println("Released: " + key_name);
 					}
 					if (Keyboard.getEventCharacter() != Keyboard.CHAR_NONE)
 						System.out.println("Typed: " + Keyboard.getEventCharacter());