diff --git a/cratonclient/tests/base.py b/cratonclient/tests/base.py
index bff22d9..959578b 100644
--- a/cratonclient/tests/base.py
+++ b/cratonclient/tests/base.py
@@ -16,29 +16,8 @@
 # under the License.
 """Base TestCase for all cratonclient tests."""
 
-import mock
-import six
-
 from oslotest import base
 
-from cratonclient.shell import main
-
 
 class TestCase(base.BaseTestCase):
     """Test case base class for all unit tests."""
-
-
-class ShellTestCase(base.BaseTestCase):
-    """Test case base class for all shell unit tests."""
-
-    def shell(self, arg_str, exitcodes=(0,)):
-        """Main function for exercising the craton shell."""
-        with mock.patch('sys.stdout', new=six.StringIO()) as mock_stdout, \
-            mock.patch('sys.stderr', new=six.StringIO()) as mock_stderr:
-
-            try:
-                main_shell = main.CratonShell()
-                main_shell.main(arg_str.split())
-            except SystemExit:
-                pass
-            return (mock_stdout.getvalue(), mock_stderr.getvalue())
diff --git a/cratonclient/tests/integration/base.py b/cratonclient/tests/integration/base.py
new file mode 100644
index 0000000..2584ec8
--- /dev/null
+++ b/cratonclient/tests/integration/base.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2010-2011 OpenStack Foundation
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+"""Some integration testing utilities."""
+
+import mock
+import six
+
+from cratonclient.shell import main
+from cratonclient.tests import base
+
+
+class ShellTestCase(base.TestCase):
+    """Test case base class for all shell unit tests."""
+
+    def shell(self, arg_str, exitcodes=(0,)):
+        """Main function for exercising the craton shell."""
+        with mock.patch('sys.stdout', new=six.StringIO()) as mock_stdout, \
+            mock.patch('sys.stderr', new=six.StringIO()) as mock_stderr:
+
+            try:
+                main_shell = main.CratonShell()
+                main_shell.main(arg_str.split())
+            except SystemExit:
+                pass
+            return (mock_stdout.getvalue(), mock_stderr.getvalue())
diff --git a/cratonclient/tests/unit/test_cells_shell.py b/cratonclient/tests/integration/test_cells_shell.py
similarity index 99%
rename from cratonclient/tests/unit/test_cells_shell.py
rename to cratonclient/tests/integration/test_cells_shell.py
index 732ee93..52e3e15 100644
--- a/cratonclient/tests/unit/test_cells_shell.py
+++ b/cratonclient/tests/integration/test_cells_shell.py
@@ -20,7 +20,7 @@ from testtools import matchers
 
 from cratonclient import exceptions as exc
 from cratonclient.shell.v1 import cells_shell
-from cratonclient.tests import base
+from cratonclient.tests.integration import base
 from cratonclient.v1 import cells
 
 
diff --git a/cratonclient/tests/unit/test_hosts_shell.py b/cratonclient/tests/integration/test_hosts_shell.py
similarity index 99%
rename from cratonclient/tests/unit/test_hosts_shell.py
rename to cratonclient/tests/integration/test_hosts_shell.py
index a91dcc0..708135a 100644
--- a/cratonclient/tests/unit/test_hosts_shell.py
+++ b/cratonclient/tests/integration/test_hosts_shell.py
@@ -20,7 +20,7 @@ from testtools import matchers
 
 from cratonclient import exceptions as exc
 from cratonclient.shell.v1 import hosts_shell
-from cratonclient.tests import base
+from cratonclient.tests.integration import base
 from cratonclient.v1 import hosts
 
 
diff --git a/cratonclient/tests/unit/test_main_shell.py b/cratonclient/tests/integration/test_main_shell.py
similarity index 99%
rename from cratonclient/tests/unit/test_main_shell.py
rename to cratonclient/tests/integration/test_main_shell.py
index d59ab28..8b3424b 100644
--- a/cratonclient/tests/unit/test_main_shell.py
+++ b/cratonclient/tests/integration/test_main_shell.py
@@ -19,7 +19,7 @@ import re
 from testtools import matchers
 
 from cratonclient.shell import main
-from cratonclient.tests import base
+from cratonclient.tests.integration import base
 
 
 class TestMainShell(base.ShellTestCase):
diff --git a/cratonclient/tests/unit/test_regions_shell.py b/cratonclient/tests/integration/test_regions_shell.py
similarity index 99%
rename from cratonclient/tests/unit/test_regions_shell.py
rename to cratonclient/tests/integration/test_regions_shell.py
index 7f245ee..95ebc01 100644
--- a/cratonclient/tests/unit/test_regions_shell.py
+++ b/cratonclient/tests/integration/test_regions_shell.py
@@ -17,7 +17,7 @@ from argparse import Namespace
 from testtools import matchers
 
 from cratonclient.shell.v1 import regions_shell
-from cratonclient.tests import base
+from cratonclient.tests.integration import base
 from cratonclient.v1 import regions