diff --git a/tests/test_13_validate.py b/tests/test_13_validate.py
index b7092bf..6722b6a 100644
--- a/tests/test_13_validate.py
+++ b/tests/test_13_validate.py
@@ -2,11 +2,9 @@
 # -*- coding: utf-8 -*-
 
 import saml2
-import xmldsig as ds
 
 from saml2 import saml
 from saml2 import samlp
-from saml2 import md
 from saml2.validate import valid_duration, MustValueError
 from saml2.validate import valid_unsigned_short
 from saml2.validate import valid_non_negative_integer
diff --git a/tests/test_20_assertion.py b/tests/test_20_assertion.py
index 0575a3c..10f0243 100644
--- a/tests/test_20_assertion.py
+++ b/tests/test_20_assertion.py
@@ -26,8 +26,8 @@ from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
 from saml2 import saml
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 from pathutils import full_path
 
diff --git a/tests/test_22_mdie.py b/tests/test_22_mdie.py
index 6814a29..6ad701d 100644
--- a/tests/test_22_mdie.py
+++ b/tests/test_22_mdie.py
@@ -10,8 +10,8 @@ from saml2.extension import idpdisc
 from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 ONTS = {
     saml.NAMESPACE: saml,
diff --git a/tests/test_30_mdstore.py b/tests/test_30_mdstore.py
index 1e4ed8e..9d62092 100644
--- a/tests/test_30_mdstore.py
+++ b/tests/test_30_mdstore.py
@@ -26,8 +26,8 @@ from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
 from saml2.s_utils import UnknownPrincipal
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 from pathutils import full_path
 
diff --git a/tests/test_30_mdstore_old.py b/tests/test_30_mdstore_old.py
index 7ef04de..77f6e41 100644
--- a/tests/test_30_mdstore_old.py
+++ b/tests/test_30_mdstore_old.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 import datetime
 import re
-from urllib import quote_plus
-from saml2.httpbase import HTTPBase
 
 from saml2.mdstore import MetadataStore, MetaDataMDX
 from saml2.mdstore import destinations
@@ -26,8 +24,8 @@ from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
 from saml2.s_utils import UnknownPrincipal
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 from pathutils import full_path
 
diff --git a/tests/test_37_entity_categories.py b/tests/test_37_entity_categories.py
index 3e95458..73ef513 100644
--- a/tests/test_37_entity_categories.py
+++ b/tests/test_37_entity_categories.py
@@ -12,8 +12,8 @@ from saml2.extension import ui
 from pathutils import full_path
 from saml2.mdstore import MetadataStore
 from saml2.server import Server
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 ONTS = {
     saml.NAMESPACE: saml,
diff --git a/tests/test_51_client.py b/tests/test_51_client.py
index 26b9da8..cf999bd 100644
--- a/tests/test_51_client.py
+++ b/tests/test_51_client.py
@@ -4,7 +4,7 @@
 import base64
 import urllib
 import urlparse
-from xmldsig import SIG_RSA_SHA256
+from saml2.xmldsig import SIG_RSA_SHA256
 from saml2 import BINDING_HTTP_POST
 from saml2 import BINDING_HTTP_REDIRECT
 from saml2 import config
diff --git a/tests/test_60_sp.py b/tests/test_60_sp.py
index dcf72a6..36d2723 100644
--- a/tests/test_60_sp.py
+++ b/tests/test_60_sp.py
@@ -5,7 +5,7 @@ import base64
 from saml2.authn_context import INTERNETPROTOCOLPASSWORD
 from saml2.saml import NAMEID_FORMAT_TRANSIENT
 from saml2.samlp import NameIDPolicy
-from s2repoze.plugins.sp import make_plugin
+from saml2.s2repoze.plugins.sp import make_plugin
 from saml2.server import Server
 
 ENV1 = {'SERVER_SOFTWARE': 'CherryPy/3.1.2 WSGI Server',
diff --git a/tests/test_76_metadata_in_mdb.py b/tests/test_76_metadata_in_mdb.py
index 6520ec1..567787b 100644
--- a/tests/test_76_metadata_in_mdb.py
+++ b/tests/test_76_metadata_in_mdb.py
@@ -20,8 +20,8 @@ from saml2.extension import idpdisc
 from saml2.extension import dri
 from saml2.extension import mdattr
 from saml2.extension import ui
-import xmldsig
-import xmlenc
+from saml2 import xmldsig
+from saml2 import xmlenc
 
 from pathutils import full_path
 
diff --git a/tests/test_82_pefim.py b/tests/test_82_pefim.py
index f40608c..d617566 100644
--- a/tests/test_82_pefim.py
+++ b/tests/test_82_pefim.py
@@ -1,4 +1,4 @@
-import xmldsig as ds
+from saml2 import xmldsig as ds
 from saml2 import config
 from saml2 import extension_elements_to_elements
 from saml2 import element_to_extension_element