diff --git a/tests/disco_conf.py b/tests/disco_conf.py
new file mode 100644
index 0000000..8088c8f
--- /dev/null
+++ b/tests/disco_conf.py
@@ -0,0 +1,32 @@
+from saml2.extension.idpdisc import BINDING_DISCO
+
+try:
+    from saml2.sigver import get_xmlsec_binary
+except ImportError:
+    get_xmlsec_binary = None
+
+if get_xmlsec_binary:
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
+else:
+    xmlsec_path = '/usr/bin/xmlsec1'
+
+BASE = "http://localhost:8088"
+
+CONFIG = {
+    "entityid" : "%s/disco.xml" % BASE,
+    "name" : "Rolands Discoserver",
+    "service": {
+        "ds": {
+            "endpoints" : {
+                "disco_service": [
+                    ("%s/disco" % BASE, BINDING_DISCO),
+                ]
+            },
+        },
+    },
+    "debug" : 1,
+    "xmlsec_binary" : xmlsec_path,
+    "metadata": {
+        "local": ["servera.xml"],
+    },
+}
diff --git a/tests/servera_conf.py b/tests/servera_conf.py
new file mode 100644
index 0000000..1bb14f0
--- /dev/null
+++ b/tests/servera_conf.py
@@ -0,0 +1,91 @@
+from saml2.extension.idpdisc import BINDING_DISCO
+from saml2 import BINDING_SOAP
+from saml2 import BINDING_PAOS
+from saml2 import BINDING_HTTP_POST
+from saml2 import BINDING_HTTP_REDIRECT
+from saml2 import BINDING_HTTP_ARTIFACT
+from saml2.saml import NAMEID_FORMAT_TRANSIENT
+from saml2.saml import NAMEID_FORMAT_PERSISTENT
+
+try:
+    from saml2.sigver import get_xmlsec_binary
+    xmlsec_path = get_xmlsec_binary(["/opt/local/bin"])
+except ImportError:
+    xmlsec_path = '/usr/bin/xmlsec1'
+
+
+BASE = "http://lingon.catalogix.se:8087"
+
+CONFIG={
+    "entityid" : "urn:mace:example.com:saml:roland:sp",
+    "name" : "urn:mace:example.com:saml:roland:sp",
+    "description": "My own SP",
+    "service": {
+        "sp": {
+            "endpoints":{
+                "assertion_consumer_service": [
+                    ("%s/" % BASE, BINDING_HTTP_POST),
+                    ("%s/paos" % BASE, BINDING_PAOS),
+                    ("%s/redirect" % BASE, BINDING_HTTP_REDIRECT)],
+                "artifact_resolution_service":[
+                    ("%s/ars" % BASE, BINDING_SOAP)
+                ],
+                "manage_name_id_service":[
+                    ("%s/mni/soap" % BASE, BINDING_SOAP),
+                    ("%s/mni/post" % BASE, BINDING_HTTP_POST),
+                    ("%s/mni/redirect" % BASE, BINDING_HTTP_REDIRECT),
+                    ("%s/mni/art" % BASE, BINDING_HTTP_ARTIFACT)
+                ],
+                "single_logout_service": [
+                    ("%s/sls" % BASE, BINDING_SOAP)
+                ],
+                "discovery_response":[
+                    ("%s/disco" % BASE, BINDING_DISCO)
+                ]
+            },
+            "required_attributes": ["surName", "givenName", "mail"],
+            "optional_attributes": ["title", "eduPersonAffiliation"],
+            "idp": ["urn:mace:example.com:saml:roland:idp"],
+            "name_id_format":[NAMEID_FORMAT_TRANSIENT, NAMEID_FORMAT_PERSISTENT]
+            }
+    },
+    "debug" : 1,
+    "key_file" : "test.key",
+    "cert_file" : "test.pem",
+    "ca_certs": "cacerts.txt",
+    "xmlsec_binary" : xmlsec_path,
+    "metadata": {
+        "local": ["idp_all.xml", "vo_metadata.xml"],
+        },
+    "virtual_organization" : {
+        "urn:mace:example.com:it:tek":{
+            "nameid_format" : "urn:oid:1.3.6.1.4.1.1466.115.121.1.15-NameID",
+            "common_identifier": "umuselin",
+            }
+    },
+    "subject_data": "subject_data.db",
+    "accepted_time_diff": 60,
+    "attribute_map_dir" : "attributemaps",
+    #"valid_for": 6,
+    "organization": {
+        "name": ("AB Exempel", "se"),
+        "display_name": ("AB Exempel", "se"),
+        "url": "http://www.example.org",
+        },
+    "contact_person": [{
+                           "given_name": "Roland",
+                           "sur_name": "Hedberg",
+                           "telephone_number": "+46 70 100 0000",
+                           "email_address": ["tech@eample.com", "tech@example.org"],
+                           "contact_type": "technical"
+                       },
+                       ],
+    "logger": {
+        "rotating": {
+            "filename": "sp.log",
+            "maxBytes": 100000,
+            "backupCount": 5,
+            },
+        "loglevel": "info",
+        }
+}