diff --git a/.gitignore b/.gitignore
index 4ebacf429a..756055b2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ credentials.yml
 *.out
 .coverage
 .tox
+.cache
 results.xml
 coverage.xml
 /test/units/cover-html
diff --git a/Makefile b/Makefile
index 4dbede4722..6465b8bf53 100644
--- a/Makefile
+++ b/Makefile
@@ -106,10 +106,10 @@ NOSETESTS3 ?= nosetests-3.5
 all: clean python
 
 tests:
-	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase
+	PYTHONPATH=./lib $(NOSETESTS) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server
 
 tests-py3:
-	PYTHONPATH=./lib $(NOSETESTS3) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase
+	PYTHONPATH=./lib $(NOSETESTS3) -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches --cover-erase -e test_os_server
 
 integration:
 	test/utils/shippable/integration.sh
diff --git a/test/units/modules/core/cloud/openstack/__init__.py b/test/units/modules/core/cloud/openstack/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/unit/cloud/openstack/test_os_server.py b/test/units/modules/core/cloud/openstack/test_os_server.py
similarity index 98%
rename from test/unit/cloud/openstack/test_os_server.py
rename to test/units/modules/core/cloud/openstack/test_os_server.py
index bb1f79ad2f..a2c017edec 100644
--- a/test/unit/cloud/openstack/test_os_server.py
+++ b/test/units/modules/core/cloud/openstack/test_os_server.py
@@ -4,7 +4,7 @@ import yaml
 import inspect
 import collections
 
-from cloud.openstack import os_server
+from ansible.modules.core.cloud.openstack import os_server
 
 
 class AnsibleFail(Exception):
@@ -180,6 +180,8 @@ class TestCreateServer(object):
             flavor: m1.tiny
             nics:
               - net-name: network1
+            meta:
+              - key: value
         '''
         with pytest.raises(AnsibleExit):
             os_server._create_server(self.module, self.cloud)