diff --git a/setup.py b/setup.py
index c40f9ac..b96f62f 100644
--- a/setup.py
+++ b/setup.py
@@ -26,8 +26,8 @@ setup(
     description='SwiftOnHPSS',
     license='Apache License (2.0)',
     author='HPSS Collaboration',
-    url='https://github.com/hpss-collaboration/swiftonhpss',
-    packages=find_packages(exclude=['test', 'bin']),
+    url='https://github.com/openstack/swiftonhpss',
+    packages=find_packages(exclude=['test', 'bin', 'system_test']),
     test_suite='nose.collector',
     classifiers=[
         'Development Status :: 3 - Alpha',