diff --git a/integration_tests/blockstack_integration_tests/scenarios/subdomain_registrar_redirect_test.py b/integration_tests/blockstack_integration_tests/scenarios/subdomain_registrar_redirect_test.py
index c54a4df86..4be4e21a5 100644
--- a/integration_tests/blockstack_integration_tests/scenarios/subdomain_registrar_redirect_test.py
+++ b/integration_tests/blockstack_integration_tests/scenarios/subdomain_registrar_redirect_test.py
@@ -65,7 +65,6 @@ def start_subdomain_registrar():
         env['BLOCKSTACK_TEST_CLIENT_RPC_PORT'] = os.environ.get('BLOCKSTACK_TEST_CLIENT_RPC_PORT')
 
     SUBDOMAIN_PROC = Popen(['node', SUBDOMAIN_REGISTRAR_LOCATION], env = env)
-    testlib.add_cleanup(lambda: SUBDOMAIN_PROC.kill())
 
 
 def scenario( wallets, **kw ):
@@ -134,6 +133,7 @@ def scenario( wallets, **kw ):
         print json.dumps(name_info)
         return False
 
+    SUBDOMAIN_PROC.kill()
 
 def check( state_engine ):
 
diff --git a/setup.py b/setup.py
index d113f2f0e..2b93533bb 100755
--- a/setup.py
+++ b/setup.py
@@ -36,8 +36,7 @@ setup(
     description='Name registrations on the Bitcoin blockchain with external storage',
     keywords='blockchain bitcoin btc cryptocurrency name key value store data',
     packages=find_packages(),
-    scripts=['bin/blockstack-server', 'bin/blockstack-core', 'bin/blockstack-snapshots',
-             'bin/blockstack-subdomain-registrar'],
+    scripts=['bin/blockstack-server', 'bin/blockstack-core', 'bin/blockstack-snapshots'],
     download_url='https://github.com/blockstack/blockstore/archive/master.zip',
     zip_safe=False,
     include_package_data=True,