diff --git a/Makefile b/Makefile
index 3e37a55e679..2095cf9ed2d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)"
 all: clean python
 
 tests: 
-	PYTHONPATH=./lib nosetests
+	PYTHONPATH=./lib nosetests -v
 
 docs: $(MANPAGES)
 
diff --git a/test/TestRunner.py b/test/TestRunner.py
index 625fc6da79f..6909f260922 100644
--- a/test/TestRunner.py
+++ b/test/TestRunner.py
@@ -77,9 +77,13 @@ class TestRunner(unittest.TestCase):
        result = self._run('facter',[])
        assert "hostname" in result
 
-   def test_ohai(self):
-       result = self._run('ohai',[])
-       assert "hostname" in result
+   # temporarily disbabled since it occasionally hangs
+   # ohai's fault, setup module doesn't actually run this
+   # to get ohai's "facts" anyway
+   #
+   #def test_ohai(self):
+   #    result = self._run('ohai',[])
+   #    assert "hostname" in result
 
    def test_copy(self):
        # test copy module, change trigger, etc