diff --git a/blazarnova/openstack/__init__.py b/blazarnova/openstack/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/blazarnova/openstack/common/__init__.py b/blazarnova/openstack/common/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/blazarnova/openstack/common/test.py b/blazarnova/openstack/common/test.py
deleted file mode 100644
index 5ea7afe..0000000
--- a/blazarnova/openstack/common/test.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2010-2011 OpenStack Foundation
-# All Rights Reserved.
-#
-#    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.
-
-"""Common utilities used in testing"""
-
-import os
-
-import fixtures
-import testtools
-
-
-class BaseTestCase(testtools.TestCase):
-
-    def setUp(self):
-        super(BaseTestCase, self).setUp()
-        self._set_timeout()
-        self._fake_output()
-        self.useFixture(fixtures.FakeLogger('blazarnova.openstack.common'))
-        self.useFixture(fixtures.NestedTempfile())
-
-    def _set_timeout(self):
-        test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
-        try:
-            test_timeout = int(test_timeout)
-        except ValueError:
-            # If timeout value is invalid do not set a timeout.
-            test_timeout = 0
-        if test_timeout > 0:
-            self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
-
-    def _fake_output(self):
-        if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
-                os.environ.get('OS_STDOUT_CAPTURE') == '1'):
-            stdout = self.useFixture(fixtures.StringStream('stdout')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
-        if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or
-                os.environ.get('OS_STDERR_CAPTURE') == '1'):
-            stderr = self.useFixture(fixtures.StringStream('stderr')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
diff --git a/blazarnova/tests/__init__.py b/blazarnova/tests/__init__.py
index 6e9f20c..e69de29 100644
--- a/blazarnova/tests/__init__.py
+++ b/blazarnova/tests/__init__.py
@@ -1,20 +0,0 @@
-# Copyright (c) 2013 Bull.
-#
-# 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.
-
-from blazarnova.openstack.common import test
-
-
-class TestCase(test.BaseTestCase):
-    pass
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index 470a4cc..0000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator
-module=test
-
-# The base module to hold the copy of openstack.common
-base=climate
diff --git a/tox.ini b/tox.ini
index f32dd48..10b49bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands = {posargs}
 [flake8]
 show-source = true
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
 
 [hacking]
 import_exceptions = nova.openstack.common.gettextutils