diff --git a/ec2api_tempest_plugin/plugin.py b/ec2api_tempest_plugin/plugin.py
index eb0cd49..f81a665 100644
--- a/ec2api_tempest_plugin/plugin.py
+++ b/ec2api_tempest_plugin/plugin.py
@@ -25,7 +25,7 @@ class AWSTempestPlugin(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(os.path.dirname(
             os.path.dirname(os.path.abspath(__file__)))))[0]
-        test_dir = "ec2api/tests/functional"
+        test_dir = "ec2api_tempest_plugin"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 
diff --git a/ec2api_tempest_plugin/tests/__init__.py b/ec2api_tempest_plugin/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ec2api_tempest_plugin/tests/base.py b/ec2api_tempest_plugin/tests/base.py
deleted file mode 100644
index 1c30cdb..0000000
--- a/ec2api_tempest_plugin/tests/base.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- 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.
-
-from oslotest import base
-
-
-class TestCase(base.BaseTestCase):
-
-    """Test case base class for all unit tests."""
diff --git a/ec2api_tempest_plugin/tests/test_ec2api_tempest_plugin.py b/ec2api_tempest_plugin/tests/test_ec2api_tempest_plugin.py
deleted file mode 100644
index 3225c0d..0000000
--- a/ec2api_tempest_plugin/tests/test_ec2api_tempest_plugin.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# 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.
-
-"""
-test_ec2api_tempest_plugin
-----------------------------------
-
-Tests for `ec2api_tempest_plugin` module.
-"""
-
-from ec2api_tempest_plugin.tests import base
-
-
-class TestEc2api_tempest_plugin(base.TestCase):
-
-    def test_something(self):
-        pass