diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index a9e6dd5da..b29b85c2d 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -85,9 +85,9 @@ def do_boot(cs, args):
     image_id = image.get('id', '')
     info['image'] = _find_image(cs, image_id).name
 
-    info.pop('links', None) 
+    info.pop('links', None)
     info.pop('addresses', None)
-	
+
     utils.print_dict(info)
 
 
@@ -320,7 +320,7 @@ def do_show(cs, args):
     image_id = image.get('id', '')
     info['image'] = _find_image(cs, image_id).name
 
-    info.pop('links', None) 
+    info.pop('links', None)
     info.pop('addresses', None)
 
     utils.print_dict(info)
diff --git a/tests/v1_1/test_shell.py b/tests/v1_1/test_shell.py
index 7d0b71b0e..4e79f112b 100644
--- a/tests/v1_1/test_shell.py
+++ b/tests/v1_1/test_shell.py
@@ -38,7 +38,7 @@ class ShellTest(utils.TestCase):
 
     def test_boot(self):
         self.run_command('boot --image 1 some-server')
-        self.assert_called(
+        self.assert_called_anytime(
             'POST', '/servers',
             {'server': {
                 'flavorRef': 1,
@@ -50,7 +50,7 @@ class ShellTest(utils.TestCase):
         )
 
         self.run_command('boot --image 1 --meta foo=bar --meta spam=eggs some-server ')
-        self.assert_called(
+        self.assert_called_anytime(
             'POST', '/servers',
             {'server': {
                 'flavorRef': 1,
@@ -68,7 +68,7 @@ class ShellTest(utils.TestCase):
         cmd = 'boot some-server --image 1 --file /tmp/foo=%s --file /tmp/bar=%s'
         self.run_command(cmd % (testfile, testfile))
 
-        self.assert_called(
+        self.assert_called_anytime(
             'POST', '/servers',
             {'server': {
                 'flavorRef': 1,
@@ -97,7 +97,7 @@ class ShellTest(utils.TestCase):
         @mock.patch('__builtin__.open', mock_open)
         def test_shell_call():
             self.run_command('boot some-server --image 1 --key')
-            self.assert_called(
+            self.assert_called_anytime(
                 'POST', '/servers',
                 {'server': {
                     'flavorRef': 1,
@@ -127,7 +127,7 @@ class ShellTest(utils.TestCase):
         testfile = os.path.join(os.path.dirname(__file__), 'testfile.txt')
         expected_file_data = open(testfile).read().encode('base64')
         self.run_command('boot some-server --image 1 --key %s' % testfile)
-        self.assert_called(
+        self.assert_called_anytime(
             'POST', '/servers',
             {'server': {
                 'flavorRef': 1,