diff --git a/markupwiki/templates/markupwiki/article.html b/markupwiki/templates/markupwiki/article.html
index 307cb42..64c53b1 100644
--- a/markupwiki/templates/markupwiki/article.html
+++ b/markupwiki/templates/markupwiki/article.html
@@ -6,7 +6,7 @@
 
 {% if article and mod_form %}
 <div class="article_moderation">
-<form method="POST" action="{% url update_article_status article.title %}">
+<form method="POST" action="{% url "update_article_status" article.title %}">
     <ul>
     <li>{{mod_form.status.label_tag}}  {{ mod_form.status }}</li>
     <li>
@@ -16,7 +16,7 @@
     </li>
     </ul>
 </form>
-<form method="POST" action="{% url rename_article article.title %}">
+<form method="POST" action="{% url "rename_article" article.title %}">
     <ul>
     {{ rename_form.as_ul}}
     <li>
@@ -31,7 +31,7 @@
 
 <h2 class="article_title">
 {% block article_title %}
-{% if article.section_name %}<a href="{% url view_article article.section_name %}">{{article.section_name}}</a> / {% endif %}
+{% if article.section_name %}<a href="{% url "view_article" article.section_name %}">{{article.section_name}}</a> / {% endif %}
 {{article.display_title}}
 
     {% if article.is_deleted %} [deleted] {% endif %}
@@ -42,10 +42,10 @@
 <div class="article_meta">
 {% block article_meta %}
     {% if article.editable %}
-        <a href="{% url edit_article article.title %}">edit article</a> |
+        <a href="{% url "edit_article" article.title %}">edit article</a> |
     {% endif %}
     {% if article %}
-        <a href="{% url article_history article.title %}">view history</a>
+        <a href="{% url "article_history" article.title %}">view history</a>
     {% endif %}
 {% endblock %}
 </div>
diff --git a/markupwiki/templates/markupwiki/edit_article.html b/markupwiki/templates/markupwiki/edit_article.html
index 0e2ad14..05aad12 100644
--- a/markupwiki/templates/markupwiki/edit_article.html
+++ b/markupwiki/templates/markupwiki/edit_article.html
@@ -10,8 +10,8 @@
 
 {% block article_meta %}
     {% if article %}
-        <a href="{% url view_article article.title %}">view article</a> |
-        <a href="{% url article_history article.title %}">view history</a>
+        <a href="{% url "view_article" article.title %}">view article</a> |
+        <a href="{% url "article_history" article.title %}">view history</a>
     {% endif %}
 {% endblock %}
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..3265887
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,54 @@
+[tox]
+envlist = py27-django14, py27-django15, py27-django16, py33-django15, py33-django16, flake8
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 markupfield
+
+[django14]
+deps =
+    docutils
+    pygments
+    Markdown
+    django-markupfield
+    Django>=1.4,<1.5
+
+[django15]
+deps =
+    docutils
+    pygments
+    Markdown
+    django-markupfield
+    Django>=1.5,<1.6
+
+[django16]
+deps =
+    docutils
+    pygments
+    markdown
+    django-markupfield
+    Django>=1.6,<1.7
+
+[testenv]
+commands =
+    django-admin.py test --settings example.settings
+
+[testenv:py27-django14]
+basepython = python2.7
+deps = {[django14]deps}
+
+[testenv:py27-django15]
+basepython = python2.7
+deps = {[django15]deps}
+
+[testenv:py27-django16]
+basepython = python2.7
+deps = {[django16]deps}
+
+[testenv:py33-django15]
+basepython = python3.3
+deps = {[django15]deps}
+
+[testenv:py33-django16]
+basepython = python3.3
+deps = {[django16]deps}