--- a/integration-tests/src/test/java/com/redhat/thermostat/itest/CliTest.java	Fri Jun 28 12:44:41 2013 -0400
+++ b/integration-tests/src/test/java/com/redhat/thermostat/itest/CliTest.java	Mon Jun 24 14:15:01 2013 -0600
@@ -37,13 +37,11 @@
 package com.redhat.thermostat.itest;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import expectj.Spawn;
@@ -196,7 +194,7 @@
     }
 
     @Test
-    public void testUnrecognizedEventsInShell() throws IOException, TimeoutException {
+    public void testUnrecognizedEventsInShell() throws Exception {
         // test '!' events
         Spawn shell = spawnThermostat("shell");
 
@@ -204,6 +202,7 @@
         shell.send("what!?!\n");
         shell.expect(SHELL_PROMPT);
         shell.send("exit\n");
+        shell.expectClose();
 
         assertTrue(shell.getCurrentStandardErrContents().contains("!?!: event not found"));
         assertNoExceptions(shell.getCurrentStandardOutContents(), shell.getCurrentStandardErrContents());