diff --git a/src/postorius/tests/test_domain_view.py b/src/postorius/tests/test_domain_view.py
index b4d513f..fdd7428 100644
--- a/src/postorius/tests/test_domain_view.py
+++ b/src/postorius/tests/test_domain_view.py
@@ -21,7 +21,7 @@
 from django.test import TestCase
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
-from postorius.forms import DomainNew
+from postorius.forms import DomainForm
 
 
 class DomainViewTest(TestCase):
@@ -39,4 +39,4 @@
         self.client.login(username='su', password='pass')
         response = self.client.get(reverse('domain_new'), follow=True)
         self.assertEquals(response.status_code, 200)
-        self.assertIsInstance(response.context['form'], DomainNew)
+        self.assertIsInstance(response.context['form'], DomainForm)
diff --git a/src/postorius/tests/test_forms.py b/src/postorius/tests/test_forms.py
index ac04d4f..7790626 100644
--- a/src/postorius/tests/test_forms.py
+++ b/src/postorius/tests/test_forms.py
@@ -20,7 +20,7 @@
 from django.test import TestCase
 
 from postorius.forms import (
-    ChangeSubscriptionForm, DomainNew, ListIdentityForm, ListNew,
+    ChangeSubscriptionForm, DomainForm, ListIdentityForm, ListNew,
     ListSubscribe, UserPreferences)
 
 
@@ -39,10 +39,11 @@
 class DomainNewTest(TestCase):
 
     def test_form_fields_valid(self):
-        form = DomainNew({
+        form = DomainForm({
             'mail_host': 'mailman.most-desirable.org',
             'description': 'The Most Desirable organization',
             'contact_address': 'contact@mailman.most-desirable.org',
+            'site': 1,
         })
         self.assertTrue(form.is_valid())
 
diff --git a/src/postorius/views/domain.py b/src/postorius/views/domain.py
index 1013a13..88f8b11 100644
--- a/src/postorius/views/domain.py
+++ b/src/postorius/views/domain.py
@@ -26,7 +26,6 @@
 from django.http import Http404
 from django.shortcuts import render, redirect
 from django.utils.translation import gettext as _
-from django_mailman3.lib.mailman import get_mailman_client
 from django_mailman3.models import MailDomain
 try:
     from urllib2 import HTTPError