diff --git a/Makefile b/Makefile
index 20f54855ab..5fa223e2ae 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ NOSETESTS := nosetests
 all: clean python
 
 tests:
-	PYTHONPATH=./lib ANSIBLE_LIBRARY=./library  $(NOSETESTS) -d -v
+	PYTHONPATH=./lib ANSIBLE_LIBRARY=./library  $(NOSETESTS) -d -w test/units -v
 
 authors:
 	sh hacking/authors.sh
diff --git a/test/units/TestInventory.py b/test/units/TestInventory.py
index 1fd7b88744..364127250d 100644
--- a/test/units/TestInventory.py
+++ b/test/units/TestInventory.py
@@ -10,7 +10,7 @@ class TestInventory(unittest.TestCase):
     def setUp(self):
 
         self.cwd = os.getcwd()
-        self.test_dir = os.path.join(self.cwd, 'test', 'inventory_test_data')
+        self.test_dir = os.path.join(self.cwd, 'inventory_test_data')
 
         self.inventory_file             = os.path.join(self.test_dir, 'simple_hosts')
         self.large_range_inventory_file = os.path.join(self.test_dir, 'large_range')