diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..068fc36
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,10 @@
+machine:
+  python:
+    version: 3.4.2
+test:
+  override:
+    - coverage run -m unittest discover
+  post:
+    - mkdir -p $CIRCLE_ARTIFACTS/coverage
+    - cd /home/ubuntu/pirate-get && coverage html --include=`pwd`* --omit="*/tests/*,*migrations*,*__init__*"
+    - cp -R /home/ubuntu/pirate-get/htmlcov/* $CIRCLE_ARTIFACTS/coverage
diff --git a/requirements-test.txt b/requirements-test.txt
new file mode 100644
index 0000000..13e2a80
--- /dev/null
+++ b/requirements-test.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+coverage
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index df01a70..24d9dd5
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-from setuptools import setup
+#!/usr/bin/env python3
+from setuptools import setup, find_packages
 
 setup(name='pirate-get',
     version='0.2.5',
@@ -7,7 +8,7 @@ setup(name='pirate-get',
     author='vikstrous',
     author_email='me@viktorstanchev.com',
     license='GPL',
-    packages=['pirate'],
+    packages=find_packages(),
     entry_points={
         'console_scripts': ['pirate-get = pirate.pirate:main']
     },