diff --git a/Makefile b/Makefile
index b59ccc2..7ecbbdb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
 tests:
-	pytest
\ No newline at end of file
+	pytest test_maya.py
diff --git a/test_maya.py b/test_maya.py
index 403fd9a..21ec2c0 100644
--- a/test_maya.py
+++ b/test_maya.py
@@ -1,46 +1,44 @@
-import unittest
 import maya
 
 
-class SimpleTest(unittest.TestCase):
+def test_rfc2822():
+    r = maya.now().rfc2822()
+    d = maya.MayaDT.from_rfc2822(r)
+    assert r == d.rfc2822()
 
-    def test_rfc2822(self):
-        r = maya.now().rfc2822()
-        d = maya.MayaDT.from_rfc2822(r)
-        assert r == d.rfc2822()
 
-    def test_iso8601(self):
-        r = maya.now().iso8601()
-        d = maya.MayaDT.from_iso8601(r)
-        assert r == d.iso8601()
+def test_iso8601():
+    r = maya.now().iso8601()
+    d = maya.MayaDT.from_iso8601(r)
+    assert r == d.iso8601()
 
-    def test_human_when(self):
-        r1 = maya.when('yesterday')
-        r2 = maya.when('today')
 
-        assert r2.day - r1.day == 1
+def test_human_when():
+    r1 = maya.when('yesterday')
+    r2 = maya.when('today')
 
-    def test_dt_tz_translation(self):
-        d1 = maya.now().datetime()
-        d2 = maya.now().datetime(to_timezone='US/Eastern')
-        assert d1.hour - d2.hour == 5
+    assert r2.day - r1.day == 1
 
-    def test_dt_tz_naive(self):
-        d1 = maya.now().datetime(naive=True)
-        assert d1.tzinfo is None
 
-        d2 = maya.now().datetime(to_timezone='US/Eastern', naive=True)
-        assert d2.tzinfo is None
-        assert d1.hour - d2.hour == 5
+def test_dt_tz_translation():
+    d1 = maya.now().datetime()
+    d2 = maya.now().datetime(to_timezone='US/Eastern')
+    assert d1.hour - d2.hour == 5
 
-    def test_random_date(self):
-        d = maya.when('11-17-11')
-        assert d.year == 2011
-        assert d.month == 11
-        assert d.day == 17
+
+def test_dt_tz_naive():
+    d1 = maya.now().datetime(naive=True)
+    assert d1.tzinfo is None
+
+    d2 = maya.now().datetime(to_timezone='US/Eastern', naive=True)
+    assert d2.tzinfo is None
+    assert d1.hour - d2.hour == 5
+
+
+def test_random_date():
+    d = maya.when('11-17-11')
+    assert d.year == 2011
+    assert d.month == 11
+    assert d.day == 17
 
 # rand_day = maya.when('2011-02-07', timezone='US/Eastern')
-
-
-if __name__ == "__main__":
-    unittest.main()