diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/.ropeproject/globalnames b/.ropeproject/globalnames
index cf8d9de..e947604 100644
Binary files a/.ropeproject/globalnames and b/.ropeproject/globalnames differ
diff --git a/.ropeproject/history b/.ropeproject/history
index 00f2348..b544777 100644
Binary files a/.ropeproject/history and b/.ropeproject/history differ
diff --git a/.ropeproject/objectdb b/.ropeproject/objectdb
index 91ab150..7510e2c 100644
Binary files a/.ropeproject/objectdb and b/.ropeproject/objectdb differ
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..b9f5a81
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: python
+python:
+  - 2.6
+  - 2.7
+install:
+  - python ./setup.py install
+  - pip install nose --use-mirrors
+script: nosetests
diff --git a/neat/__init__.pyc b/neat/__init__.pyc
deleted file mode 100644
index 64aafa4..0000000
Binary files a/neat/__init__.pyc and /dev/null differ
diff --git a/setup.py b/setup.py
index 8eea4c2..9603325 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setup(
     platforms='any',
 
     packages=find_packages(),
-    tests_require=['nose', 'mocktest'],
+    tests_require=['nose'],  # 'mocktest'
 
     # Project uses reStructuredText, so ensure that the docutils get
     # installed or upgraded on the target machine
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index f1d5a86..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_collector.py b/tests/test_collector.py
index 8a04dc1..6ffd73e 100644
--- a/tests/test_collector.py
+++ b/tests/test_collector.py
@@ -1,10 +1,12 @@
 from pyqcy import *
 
 
-@qc
-def addition_on_ints(x=int, y=int):
-    assert isinstance(x + y, int)
+class Arithmetic(TestCase):
 
+    @qc
+    def addition_on_ints(x=int, y=int):
+        assert isinstance(x + y, int)
 
-if __name__ == '__main__':
-    main()
+    @qc
+    def subtraction_on_ints(x=int, y=int):
+        assert isinstance(x - y, int)
diff --git a/tests/test_collector.pyc b/tests/test_collector.pyc
deleted file mode 100644
index 3913bbc..0000000
Binary files a/tests/test_collector.pyc and /dev/null differ