diff --git a/tests/test_cli.py b/tests/test_cli.py
index 13826fb..70fdc2a 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -23,7 +23,7 @@ def test_cli_no_args(self):
         """Test the CLI."""
         runner = CliRunner()
         result = runner.invoke(cli.cli)
-        assert 'No host name or device_id given, see usage below' in result.output
+        assert 'No host name given, see usage below' in result.output
         assert 'Commands:' in result.output
 
     def test_cli_invalid_arg(self):
@@ -62,16 +62,7 @@ def test_cli_state(self):
         """Test the CLI."""
         runner = CliRunner()
         result = runner.invoke(cli.cli, ['state'])
-        assert 'No host name or device_id given, see usage below' in result.output
-
-# remove until I decide how to deal with waiting for connection        
-#    def test_cli_unconnectable_host_state(self):
-#        """Test the CLI."""
-#        runner = CliRunner()
-#        result = runner.invoke(cli.cli, ['--host', '127.0.0.100', 'state'])
-#        assert 'Initialising SonoffSwitch with host 127.0.0.100' in \
-#               result.output
-#        assert 'Unable to connect' in result.output
+        assert 'No host name given, see usage below' in result.output
 
     def test_cli_discover(self):
         """Test the CLI."""