diff --git a/designate_tempest_plugin/services/dns/__init__.py b/designate_tempest_plugin/services/dns/__init__.py
index e69de29..21a8d13 100644
--- a/designate_tempest_plugin/services/dns/__init__.py
+++ b/designate_tempest_plugin/services/dns/__init__.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2017 Andrea Frittoli
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+from designate_tempest_plugin.services.dns import admin
+from designate_tempest_plugin.services.dns import v1
+from designate_tempest_plugin.services.dns import v2
+
+__all__ = ['admin', 'v1', 'v2']
diff --git a/designate_tempest_plugin/services/dns/admin/__init__.py b/designate_tempest_plugin/services/dns/admin/__init__.py
index e69de29..2b43e84 100644
--- a/designate_tempest_plugin/services/dns/admin/__init__.py
+++ b/designate_tempest_plugin/services/dns/admin/__init__.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2017 Andrea Frittoli
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+from designate_tempest_plugin.services.dns.admin.json.quotas_client import \
+    QuotasClient
+
+__all__ = ['QuotasClient']
diff --git a/designate_tempest_plugin/services/dns/v1/__init__.py b/designate_tempest_plugin/services/dns/v1/__init__.py
index e69de29..fdaf099 100644
--- a/designate_tempest_plugin/services/dns/v1/__init__.py
+++ b/designate_tempest_plugin/services/dns/v1/__init__.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2017 Andrea Frittoli
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+from designate_tempest_plugin.services.dns.v1.json.domains_client import \
+    DomainsClient
+from designate_tempest_plugin.services.dns.v1.json.records_client import \
+    RecordsClient
+from designate_tempest_plugin.services.dns.v1.json.servers_client import \
+    ServersClient
+
+__all__ = ['DomainsClient', 'RecordsClient', 'ServersClient']
diff --git a/designate_tempest_plugin/services/dns/v2/__init__.py b/designate_tempest_plugin/services/dns/v2/__init__.py
index e69de29..34847e7 100644
--- a/designate_tempest_plugin/services/dns/v2/__init__.py
+++ b/designate_tempest_plugin/services/dns/v2/__init__.py
@@ -0,0 +1,40 @@
+# Copyright (c) 2017 Andrea Frittoli
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+from designate_tempest_plugin.services.dns.v2.json.blacklists_client import \
+    BlacklistsClient
+from designate_tempest_plugin.services.dns.v2.json.pool_client import \
+    PoolClient
+from designate_tempest_plugin.services.dns.v2.json.quotas_client import \
+    QuotasClient
+from designate_tempest_plugin.services.dns.v2.json.recordset_client import \
+    RecordsetClient
+from designate_tempest_plugin.services.dns.v2.json.tld_client import TldClient
+from designate_tempest_plugin.services.dns.v2.json.transfer_accepts_client \
+    import TransferAcceptClient
+from designate_tempest_plugin.services.dns.v2.json.transfer_request_client \
+    import TransferRequestClient
+from designate_tempest_plugin.services.dns.v2.json.tsigkey_client import \
+    TsigkeyClient
+from designate_tempest_plugin.services.dns.v2.json.zone_exports_client import \
+    ZoneExportsClient
+from designate_tempest_plugin.services.dns.v2.json.zone_imports_client import \
+    ZoneImportsClient
+from designate_tempest_plugin.services.dns.v2.json.zones_client import \
+    ZonesClient
+
+__all__ = ['BlacklistsClient', 'PoolClient', 'QuotasClient', 'RecordsetClient',
+           'TldClient', 'TransferAcceptClient', 'TransferRequestClient',
+           'TsigkeyClient', 'ZoneExportsClient', 'ZoneImportsClient',
+           'ZonesClient']
diff --git a/designate_tempest_plugin/tests/api/v2/test_zones_imports.py b/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
index d1ae182..42a20dc 100644
--- a/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
+++ b/designate_tempest_plugin/tests/api/v2/test_zones_imports.py
@@ -23,7 +23,7 @@
 
 class BaseZonesImportTest(base.BaseDnsV2Test):
     excluded_keys = ['created_at', 'updated_at', 'version', 'links',
-                     'status', 'message']
+                     'status', 'message', 'zone_id']
 
 
 class ZonesImportTest(BaseZonesImportTest):
diff --git a/designate_tempest_plugin/tests/base.py b/designate_tempest_plugin/tests/base.py
index 8f3e83d..43579dc 100644
--- a/designate_tempest_plugin/tests/base.py
+++ b/designate_tempest_plugin/tests/base.py
@@ -75,6 +75,12 @@
                         % cls.__name__)
             raise cls.skipException(skip_msg)
 
+    @classmethod
+    def setup_credentials(cls):
+        # Do not create network resources for these test.
+        cls.set_network_resources()
+        super(BaseDnsTest, cls).setup_credentials()
+
     def assertExpected(self, expected, actual, excluded_keys):
         for key, value in six.iteritems(expected):
             if key not in excluded_keys:
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index e61b63a..0000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE="$1"
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ "$CONSTRAINTS_FILE" != http* ]]; then
-    CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
-
-pip install -c"$localfile" openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints "$localfile" -- "$CLIENT_NAME"
-
-pip install -c"$localfile" -U "$@"
-exit $?
diff --git a/tox.ini b/tox.ini
index 196d873..3163c7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,13 +5,13 @@
 
 [testenv]
 usedevelop = True
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+install_command = pip install {opts} {packages}
+deps =
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 setenv =
     VIRTUAL_ENV={envdir}
-    BRANCH_NAME=master
-    CLIENT_NAME=designate-tempest-plugin
   PYTHONDONTWRITEBYTECODE=1
 whitelist_externals = sh
                       find