diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 7f7cedd..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,32 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-setup.py
-django_mailbox/__init__.py
-django_mailbox/admin.py
-django_mailbox/models.py
-django_mailbox/signals.py
-django_mailbox/management/__init__.py
-django_mailbox/management/commands/__init__.py
-django_mailbox/management/commands/getmail.py
-django_mailbox/management/commands/processincomingmessage.py
-django_mailbox/migrations/0001_initial.py
-django_mailbox/migrations/0002_auto__chg_field_mailbox_uri.py
-django_mailbox/migrations/0003_auto__add_field_mailbox_active.py
-django_mailbox/migrations/0004_auto__add_field_message_outgoing.py
-django_mailbox/migrations/0005_rename_fields.py
-django_mailbox/migrations/0006_auto__add_field_message_in_reply_to.py
-django_mailbox/migrations/0007_auto__del_field_message_address__add_field_message_from_header__add_fi.py
-django_mailbox/migrations/0008_populate_from_to_fields.py
-django_mailbox/migrations/0009_remove_references_table.py
-django_mailbox/migrations/0010_auto__add_field_mailbox_from_email.py
-django_mailbox/migrations/0011_auto__add_field_message_read.py
-django_mailbox/migrations/0012_auto__add_messageattachment.py
-django_mailbox/migrations/__init__.py
-django_mailbox/transports/__init__.py
-django_mailbox/transports/babyl.py
-django_mailbox/transports/generic.py
-django_mailbox/transports/imap.py
-django_mailbox/transports/maildir.py
-django_mailbox/transports/mbox.py
-django_mailbox/transports/mh.py
-django_mailbox/transports/mmdf.py
-django_mailbox/transports/pop3.py
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..0d66c61
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist=py27,py35
+
+[testenv]
+commands=
+    pip install django
+    pip install -r test_requirements.txt
+    py.test {posargs}