diff --git a/src/postorius/management/commands/mmclient.py b/src/postorius/management/commands/mmclient.py
index 69b24ac..05bb297 100644
--- a/src/postorius/management/commands/mmclient.py
+++ b/src/postorius/management/commands/mmclient.py
@@ -17,7 +17,7 @@
 # Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.core.management.base import BaseCommand
-from postorius import utils
+from django_mailman3.lib.mailman import get_mailman_client
 
 
 class Command(BaseCommand):
@@ -42,7 +42,7 @@
             shell = code.InteractiveConsole(globals())
             console_fn = shell.interact
         # connect to mailmanclient
-        client = utils.get_client()
+        client = get_mailman_client()
         # Putting client back in the global scope
         globals()['client'] = client
         # run the interpreter
diff --git a/src/postorius/models.py b/src/postorius/models.py
index 854dcc8..b0ce8de 100644
--- a/src/postorius/models.py
+++ b/src/postorius/models.py
@@ -33,8 +33,8 @@
 from django.db import models
 from django.http import Http404
 from django.template.loader import render_to_string
+from django_mailman3.lib.mailman import get_mailman_client
 from mailmanclient import MailmanConnectionError
-from postorius.utils import get_client
 try:
     from urllib2 import HTTPError
 except ImportError:
@@ -81,7 +81,7 @@
 
     def all(self):
         try:
-            return getattr(get_client(), self.resource_name_plural)
+            return getattr(get_mailman_client(), self.resource_name_plural)
         except AttributeError:
             raise MailmanApiError
         except MailmanConnectionError as e:
@@ -89,7 +89,7 @@
 
     def get(self, *args, **kwargs):
         try:
-            method = getattr(get_client(), 'get_' + self.resource_name)
+            method = getattr(get_mailman_client(), 'get_' + self.resource_name)
             return method(*args, **kwargs)
         except AttributeError as e:
             raise MailmanApiError(e)
@@ -113,7 +113,8 @@
 
     def create(self, *args, **kwargs):
         try:
-            method = getattr(get_client(), 'create_' + self.resource_name)
+            method = getattr(
+                get_mailman_client(), 'create_' + self.resource_name)
             return method(*args, **kwargs)
         except AttributeError as e:
             raise MailmanApiError(e)
@@ -139,7 +140,7 @@
 
     def all(self, only_public=False):
         try:
-            objects = getattr(get_client(), self.resource_name_plural)
+            objects = getattr(get_mailman_client(), self.resource_name_plural)
         except AttributeError:
             raise MailmanApiError
         except MailmanConnectionError as e:
diff --git a/src/postorius/templates/postorius/domain/new.html b/src/postorius/templates/postorius/domain/new.html
index 50f2802..5b514d1 100644
--- a/src/postorius/templates/postorius/domain/new.html
+++ b/src/postorius/templates/postorius/domain/new.html
@@ -13,7 +13,7 @@
     </div>
 
     <form action="{% url 'domain_new' %}" method="post" class="form-horizontal">
-        {% render_form_horizontal form 2 8 'Create domain' %}
+        {% bootstrap_form_horizontal form 2 8 'Create domain' %}
     </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lib/form-horizontal.html b/src/postorius/templates/postorius/lib/form-horizontal.html
deleted file mode 100644
index 839e52a..0000000
--- a/src/postorius/templates/postorius/lib/form-horizontal.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% load i18n %}
-{% load bootstrap_tags %}
-
-{% if form.non_field_errors %}
-    <div class="alert alert-danger">{{ form.non_field_errors }}</div>
-{% endif %}
-
-{% csrf_token %}
-{% for hidden in form.hidden_fields %}
-    {{ hidden }}
-{% endfor %}
-
-{% for field in form.visible_fields %}
-    <div class="form-group {% if field.errors %}has-errors{% endif %}">
-        <label class="control-label col-md-{{ size_left }}"
-               for="{{ field.id_for_label }}">
-            {{ field.label }}
-        </label>
-        <div class="col-md-{{ size_right }}">
-            {% if field|fieldtype == 'RadioSelect' %}
-                {% for choice in field %}
-                    <label class="radio-inline">
-                        {{ choice.tag }}
-                        {{ choice.choice_label }}
-                    </label>
-                {% endfor %}
-            {% elif field|fieldtype == 'CheckboxSelectMultiple' %}
-                {% for choice in field %}
-                    <div class="checkbox">
-                        <label>
-                            {{ choice }} {{ choice.label }}
-                        </label>
-                    </div>
-                {% endfor %}
-            {% else %}
-                {{ field|add_form_control }}
-            {% endif %}
-            {% for error in field.errors %}
-                <div class="text-danger">{{ error }}</div>
-            {% endfor %}
-        </div>
-        {% if field.help_text %}
-        <p id="help-{{ field.id_for_label }}"
-           class="col-md-offset-{{ size_left }} col-md-{{ size_right }} help-block">
-            {{ field.help_text|linebreaksbr }}
-        </p>
-        {% endif %}
-    </div>
-{% endfor %}
-{% if button %}
-    <div class="form-group">
-        <div class="col-md-offset-{{ size_left }} col-md-{{ size_right }}">
-            <button class="btn btn-primary" type="submit">{% trans button %}</button>
-        </div>
-    </div>
-{% endif %}
diff --git a/src/postorius/templates/postorius/lists/mass_removal.html b/src/postorius/templates/postorius/lists/mass_removal.html
index 24ceac9..c1328b7 100644
--- a/src/postorius/templates/postorius/lists/mass_removal.html
+++ b/src/postorius/templates/postorius/lists/mass_removal.html
@@ -8,7 +8,7 @@
     {% list_nav 'list_mass_ops' 'Mass Removal' %}
 
     <form action="{% url 'mass_removal' list.list_id %}" method="post" class="form-horizontal">
-        {% render_form_horizontal form 2 8 %}
+        {% bootstrap_form_horizontal form 2 8 %}
         <div class="form-group">
             <div class="col-md-offset-2 col-md-8">
                 <button class="btn btn-warning" type="submit">{% trans 'Unsubscribe users' %}</button>
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index 0971642..521b958 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -12,7 +12,7 @@
     {% list_nav 'list_mass_ops' 'Mass subscription' %}
 
     <form action="{% url 'mass_subscribe' list.list_id %}" method="post" class="form-horizontal">
-        {% render_form_horizontal form 2 8 'Subscribe users' %}
+        {% bootstrap_form_horizontal form 2 8 'Subscribe users' %}
     </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index ac95262..70175c9 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -16,14 +16,14 @@
         <p>{% trans 'You are not the owner for this list' %}</p>
     {% else %}
         <form action="{% url 'list_member_options' list.list_id mm_member.email %}" method="post" class="form-horizontal">
-            {% render_form_horizontal preferences_form 3 8 'Save changes' %}
+            {% bootstrap_form_horizontal preferences_form 3 8 'Save changes' %}
             <input type="hidden" name="formname" value="preferences" />
         </form>
         <div class="panel panel-default">
             <div class="panel-heading">Administration options</div>
             <div class="panel-body">
                 <form action="{% url 'list_member_options' list.list_id mm_member.email %}" method="post" class="form-horizontal">
-                    {% render_form_horizontal moderation_form 3 8 'Save changes' %}
+                    {% bootstrap_form_horizontal moderation_form 3 8 'Save changes' %}
                     <input type="hidden" name="formname" value="moderation" />
                 </form>
             </div>
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index c7eb1b3..012a1e2 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -13,7 +13,7 @@
     </div>
 
     <form action="{% url 'list_new' %}" method="post" class="form-horizontal">
-        {% render_form_horizontal form 2 8 'Create list' %}
+        {% bootstrap_form_horizontal form 2 8 'Create list' %}
     </form>
 
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index 35ca5cb..1fd1c18 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -19,7 +19,7 @@
 
     <form action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}"
           method="post" class="form-horizontal list_settings">
-        {% render_form_horizontal form 3 8 'Save changes' %}
+        {% bootstrap_form_horizontal form 3 8 'Save changes' %}
     </form>
 
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index a3b7d06..5f46500 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -55,7 +55,7 @@
               {% endblocktrans %}
             </p>
             <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="form-horizontal">
-                {% render_form_horizontal subscribe_form 2 8 'Subscribe' %}
+                {% bootstrap_form_horizontal subscribe_form 2 8 'Subscribe' %}
             </form>
         {% endif %}
     {% else %}
diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index 34c760e..4f46af3 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -21,7 +21,7 @@
     <div class="row">
         <div class="col-md-6">
             <form action="" method="post" class="well form-horizontal">
-                {% render_form_horizontal form 4 8 'Log in' %}
+                {% bootstrap_form_horizontal form 4 8 'Log in' %}
             </form>
         </div>
         <div class="col-md-6 text-center persona-login">
diff --git a/src/postorius/templates/postorius/user/list_options.html b/src/postorius/templates/postorius/user/list_options.html
index ca08666..7ec9e69 100644
--- a/src/postorius/templates/postorius/user/list_options.html
+++ b/src/postorius/templates/postorius/user/list_options.html
@@ -14,11 +14,11 @@
 {% trans 'Use this form to change the email used for this subscription' %}:
 </p>
 <form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
-    {% render_form_horizontal change_subscription_form 3 8 'Change email used for subscription' %}
+    {% bootstrap_form_horizontal change_subscription_form 3 8 'Change email used for subscription' %}
 </form>
 <hr />
 <form action="" method="post" class="form-horizontal">
-  {% render_form_horizontal form 3 8 'Save changes' %}
+  {% bootstrap_form_horizontal form 3 8 'Save changes' %}
   <input type="hidden" name="formname" value="preferences" />
 </form>
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/user/mailman_settings.html b/src/postorius/templates/postorius/user/mailman_settings.html
index b2ccb6d..d2fb9ad 100644
--- a/src/postorius/templates/postorius/user/mailman_settings.html
+++ b/src/postorius/templates/postorius/user/mailman_settings.html
@@ -24,7 +24,7 @@
         <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
     {% else %}
         <form action="{% url 'user_mailmansettings' %}" method="post" class="form-horizontal">
-            {% render_form_horizontal settingsform 3 8 'Save changes' %}
+            {% bootstrap_form_horizontal settingsform 3 8 'Save changes' %}
         </form>
     {% endif %}
 
diff --git a/src/postorius/templatetags/bootstrap_tags.py b/src/postorius/templatetags/bootstrap_tags.py
deleted file mode 100644
index 1bfcb88..0000000
--- a/src/postorius/templatetags/bootstrap_tags.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
-#
-# This file is part of Postorius.
-#
-# Postorius is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# Postorius is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Postorius.  If not, see <http://www.gnu.org/licenses/>.
-
-from django import template
-
-
-register = template.Library()
-
-
-@register.filter(name='add_form_control')
-def add_form_control(field):
-    return field.as_widget(attrs={'class': 'form-control'})
-
-
-@register.filter('fieldtype')
-def fieldtype(field):
-    return field.field.widget.__class__.__name__
-
-
-@register.inclusion_tag('postorius/lib/form-horizontal.html',
-                        takes_context=True)
-def render_form_horizontal(context, form, size_left=2, size_right=8,
-                           button=None):
-    return dict(
-        form=form,
-        size_left=size_left,
-        size_right=size_right,
-        button=button,
-        )
diff --git a/src/postorius/tests/mailman_api_tests/test_list_member_options.py b/src/postorius/tests/mailman_api_tests/test_list_member_options.py
index 6fd7fa9..0470c6a 100644
--- a/src/postorius/tests/mailman_api_tests/test_list_member_options.py
+++ b/src/postorius/tests/mailman_api_tests/test_list_member_options.py
@@ -19,10 +19,10 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
+from django_mailman3.lib.mailman import get_mailman_client
 from six.moves.urllib_parse import quote
 
 from postorius.tests.utils import ViewTestCase
-from postorius.utils import get_client
 from postorius.forms import MemberModeration, UserPreferences
 
 
@@ -34,7 +34,7 @@
 
     def setUp(self):
         super(ListMembersOptionsTest, self).setUp()
-        self.domain = get_client().create_domain('example.com')
+        self.domain = get_mailman_client().create_domain('example.com')
         self.foo_list = self.domain.create_list('foo')
         self.user = User.objects.create_user(
             'testuser', 'test@example.com', 'testpass')
@@ -46,7 +46,7 @@
             'testmoderator', 'moderator@example.com', 'testpass')
         self.foo_list.add_owner('owner@example.com')
         self.foo_list.add_moderator('moderator@example.com')
-        self.mm_user = get_client().create_user('test@example.com', '')
+        self.mm_user = get_mailman_client().create_user('test@example.com', '')
         self.mm_user.addresses[0].verify()
         self.foo_list.subscribe('test@example.com', pre_verified=True,
                                 pre_confirmed=True, pre_approved=True)
diff --git a/src/postorius/tests/utils.py b/src/postorius/tests/utils.py
index 47b0ec0..a0b8c29 100644
--- a/src/postorius/tests/utils.py
+++ b/src/postorius/tests/utils.py
@@ -24,9 +24,9 @@
 from django.test import TestCase
 from mock import MagicMock
 from six.moves.urllib_parse import quote
+from django_mailman3.lib.mailman import get_mailman_client
 from django_mailman3.tests.utils import get_flash_messages
 
-from postorius.utils import get_client
 from mailmanclient.testing.vcr_helpers import get_vcr
 
 vcr_log = logging.getLogger('vcr')
@@ -98,7 +98,7 @@
     _mm_vcr = get_vcr(cassette_library_dir=_fixtures_dir)
 
     def setUp(self):
-        self.mm_client = get_client()
+        self.mm_client = get_mailman_client()
         if self.use_vcr:
             cm = self._mm_vcr.use_cassette('.'.join([
                 self.__class__.__name__, self._testMethodName, 'yaml']))
diff --git a/src/postorius/utils.py b/src/postorius/utils.py
index b99a5ad..e78ef1b 100644
--- a/src/postorius/utils.py
+++ b/src/postorius/utils.py
@@ -17,23 +17,13 @@
 # Postorius.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 
-from django.conf import settings
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.shortcuts import render
-from django.utils.functional import cached_property
-from mailmanclient import Client
 from django.utils.translation import gettext as _
 
 
 logger = logging.getLogger(__name__)
 
 
-def get_client():
-    return Client('{0}/3.0'.format(settings.MAILMAN_REST_API_URL),
-                  settings.MAILMAN_REST_API_USER,
-                  settings.MAILMAN_REST_API_PASS)
-
-
 def render_api_error(request):
     """Renders an error template.
     Use if MailmanApiError is catched.
@@ -43,52 +33,6 @@
                               'Please start Mailman core.')})
 
 
-class MailmanPaginator(Paginator):
-    """
-    Subclass of Django's Paginator that works with MailmanClient's 'get_*_page'
-    functions. Use the function reference as the first argument::
-
-        MailmanPaginator(get_member_page, 25)
-
-    """
-
-    def __init__(self, function, per_page, **kwargs):
-        self.function = function
-        super(MailmanPaginator, self).__init__(None, per_page, **kwargs)
-
-    def page(self, number):
-        """
-        Returns a Page object for the given 1-based page number.
-        """
-        number = self.validate_number(number)
-        result = self.function(count=self.per_page, page=number)
-        return self._get_page(result, number, self)
-
-    @cached_property
-    def count(self):
-        """
-        Returns the total number of objects, across all pages.
-        """
-        # For now we need to get the first page to have the total_size.
-        # Mitigate the price of this call by using count=1.
-        return self.function(count=1, page=1).total_size
-
-
-def paginate(request, collection, count=20, paginator_class=Paginator):
-    # count is the number of items per page
-    paginator = paginator_class(collection, count)
-    page = request.GET.get('page')
-    try:
-        results = paginator.page(page)
-    except PageNotAnInteger:
-        # If page is not an integer, deliver first page.
-        results = paginator.page(1)
-    except EmptyPage:
-        # If page is out of range (e.g. 9999), deliver last page of results.
-        results = paginator.page(paginator.num_pages)
-    return results
-
-
 def set_other_emails(user):
     from postorius.models import MailmanUser, MailmanApiError, Mailman404Error
     if hasattr(user, 'other_emails'):
diff --git a/src/postorius/views/domain.py b/src/postorius/views/domain.py
index ef6f9f3..919161c 100644
--- a/src/postorius/views/domain.py
+++ b/src/postorius/views/domain.py
@@ -21,6 +21,7 @@
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.shortcuts import render, redirect
 from django.utils.translation import gettext as _
+from django_mailman3.lib.mailman import get_mailman_client
 try:
     from urllib2 import HTTPError
 except ImportError:
@@ -74,7 +75,7 @@
     """
     if request.method == 'POST':
         try:
-            client = utils.get_client()
+            client = get_mailman_client()
             client.delete_domain(domain)
             messages.success(request,
                              _('The domain %s has been deleted.' % domain))
diff --git a/src/postorius/views/generic.py b/src/postorius/views/generic.py
index 8fe6cec..1ceda01 100644
--- a/src/postorius/views/generic.py
+++ b/src/postorius/views/generic.py
@@ -18,6 +18,7 @@
 
 
 from django.views.generic import TemplateView
+from django_mailman3.lib.mailman import get_mailman_client
 
 from postorius.models import (List, MailmanUser, MailmanApiError,
                               Mailman404Error)
@@ -31,7 +32,7 @@
 
     def client(self):
         if getattr(self, '_client', None) is None:
-            self._client = utils.get_client()
+            self._client = get_mailman_client()
         return self._client
 
 
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 6944176..19309bf 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -31,6 +31,8 @@
 from django.core.exceptions import ValidationError
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
+from django_mailman3.lib.mailman import get_mailman_client
+from django_mailman3.lib.paginator import paginate, MailmanPaginator
 try:
     from urllib2 import HTTPError
 except ImportError:
@@ -102,9 +104,11 @@
                 return mailing_list.find_members(query, count=count, page=page)
         else:
             find_method = mailing_list.get_member_page
-        context['members'] = utils.paginate(
-            request, find_method, count=request.GET.get('count', 25),
-            paginator_class=utils.MailmanPaginator)
+        context['members'] = paginate(
+            find_method,
+            request.GET.get('page'),
+            request.GET.get('count', 25),
+            paginator_class=MailmanPaginator)
         if mailing_list.member_count == 0:
             context['empty_error'] = _('List has no Subscribers')
         else:
@@ -130,7 +134,7 @@
 @list_owner_required
 def list_member_options(request, list_id, email):
     template_name = 'postorius/lists/memberoptions.html'
-    client = utils.get_client()
+    client = get_mailman_client()
     mm_list = List.objects.get_or_404(fqdn_listname=list_id)
     try:
         mm_member = client.get_member(list_id, email)
@@ -315,7 +319,7 @@
 @login_required
 @list_owner_required
 def list_mass_subscribe(request, list_id):
-    mailing_list = utils.get_client().get_list(list_id)
+    mailing_list = get_mailman_client().get_list(list_id)
     if request.method == 'POST':
         form = ListMassSubscription(request.POST)
         if form.is_valid():
@@ -391,7 +395,7 @@
 @login_required
 @list_moderator_required
 def list_moderation(request, list_id, held_id=-1):
-    mailing_list = utils.get_client().get_list(list_id)
+    mailing_list = get_mailman_client().get_list(list_id)
     if request.method == 'POST':
         form = MultipleChoiceForm(request.POST)
         if form.is_valid():
@@ -415,9 +419,9 @@
                 messages.error(request, _('Message could not be found'))
     else:
         form = MultipleChoiceForm()
-    held_messages = utils.paginate(
-        request, mailing_list.get_held_page,
-        count=request.GET.get('count', 20),
+    held_messages = paginate(
+        mailing_list.get_held_page,
+        request.GET.get('page'), request.GET.get('count'),
         paginator_class=utils.MailmanPaginator)
     context = {
         'list': mailing_list,
@@ -538,6 +542,8 @@
     if request.user.is_superuser:
         only_public = False
     try:
+        # FIXME: this is not paginated, all lists will
+        # always be retrieved.
         lists = sorted(List.objects.all(only_public=only_public),
                        key=lambda l: l.fqdn_listname)
         logger.debug(lists)
@@ -546,8 +552,9 @@
     choosable_domains = _get_choosable_domains(request)
     return render(request, template,
                   {'count_options': [10, 25, 50, 100, 200], 'error': error,
-                   'lists': utils.paginate(request, lists,
-                                           count=request.GET.get('count', 10)),
+                   'lists': paginate(
+                       lists, request.GET.get('page'),
+                       request.GET.get('count', 10)),
                    'domain_count': len(choosable_domains)})
 
 
diff --git a/tox.ini b/tox.ini
index aa72404..d37bd48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,23 @@
 [tox]
 envlist = py27-django{18,19,110},pep8
 
+
 [base]
 deps =
   git+https://gitlab.com/mailman/mailmanclient.git
+  git+https://gitlab.com/mailman/django_mailman3.git
   mock
   vcrpy
   coverage
 
+
 [testenv]
 usedevelop = True
 deps =
     {[base]deps}
+    dev: -e../django-mailman3
+    dev: -e../mailmanclient
+    dev: Django>=1.8,<1.9
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
@@ -21,48 +27,19 @@
     coverage report
 setenv =
     PYTHONPATH = {toxinidir}
-
-[testenv:record]
-basepython = python2.7
-deps =
-    {[base]deps}
-    Django==1.8
-setenv =
-    PYTHONPATH = {toxinidir}
-    POSTORIUS_VCR_RECORD_MODE = all
-commands =
-    python example_project/manage.py test --settings=test_settings {posargs:postorius}
+    record: POSTORIUS_VCR_RECORD_MODE = all
 
 
-# These are used for local development and expect mailman.client to be
-# sitting in a directory next to this one.
 [testenv:dev]
-usedevelop = True
-basepython = python2.7
-deps =
-    {[base]deps}
-    Django==1.8
-setenv =
-    PYTHONPATH = {toxinidir}
 commands =
-    # Install mailmanclient from local repo instead of from pypi
-    pip install -e ../mailmanclient
     python example_project/manage.py test --settings=test_settings {posargs:postorius}
 
+
 [testenv:dev-record]
-usedevelop = True
-basepython = python2.7
-deps =
-    {[base]deps}
-    Django==1.8
-setenv =
-    PYTHONPATH = {toxinidir}
-    POSTORIUS_VCR_RECORD_MODE = all
 commands =
-    # Install mailmanclient from local repo instead of from pypi
-    pip install -e ../mailmanclient
     python example_project/manage.py test --settings=test_settings {posargs:postorius}
 
+
 [testenv:pep8]
 basepython = python2.7
 deps =
@@ -71,6 +48,7 @@
 commands =
     flake8 {posargs}
 
+
 [flake8]
 ignore = E123, E133
 show-source = True