diff --git a/setup.py b/setup.py
index e8cac27..209450a 100644
--- a/setup.py
+++ b/setup.py
@@ -38,5 +38,5 @@ setup(
                         "beautifulsoup4",
                         "mako"],
     zip_safe=False,
-    scripts=["script/saml2c.py", "script/saml2i.py"]
+    scripts=["script/idp_testdrv.py", "script/sp_testdrv.py"]
     )
\ No newline at end of file
diff --git a/src/sp_test/tests.py b/src/sp_test/tests.py
index f0698d1..43ea6e9 100644
--- a/src/sp_test/tests.py
+++ b/src/sp_test/tests.py
@@ -172,7 +172,7 @@ OPERATIONS = {
         "sequence": [(Login, AuthnRequest, AuthnResponse, None)],
         "tests": {"pre": [], "post": []}
     },
-    'verify': {
+    'FL02': {
         "name": 'Verify various aspects of the generated AuthnRequest message',
         "descr": 'Basic Login test',
         "sequence": [],
diff --git a/tests/idp/config.py.example b/tests/idp_test/config.py.example
similarity index 100%
rename from tests/idp/config.py.example
rename to tests/idp_test/config.py.example
diff --git a/tests/localhost.py b/tests/localhost.py
index 75f62b1..fe5f5cc 100755
--- a/tests/localhost.py
+++ b/tests/localhost.py
@@ -7,7 +7,7 @@ import json
 
 BASE = "http://localhost:8088"
 
-metadata = open("./idp/idp.xml").read()
+metadata = open("idp_test/idp.xml").read()
 
 info = {
     "entity_id": "%s/idp.xml" % BASE,