diff --git a/bin/keystone_data.sh b/bin/keystone_data.sh
index 588db37bb..9bd3fc8b7 100755
--- a/bin/keystone_data.sh
+++ b/bin/keystone_data.sh
@@ -71,7 +71,6 @@ if [[ "$ENABLED_SERVICES" =~ "barbican" ]]; then
             --region RegionOne \
             --service_id $BARBICAN_SERVICE \
             --publicurl "http://$SERVICE_HOST:9311" \
-            --adminurl "http://$SERVICE_HOST:9312" \
             --internalurl "http://$SERVICE_HOST:9311"
     fi
 fi
diff --git a/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican
index a5c4e8272..260e1456b 100755
--- a/contrib/devstack/lib/barbican
+++ b/contrib/devstack/lib/barbican
@@ -91,7 +91,6 @@ function configure_barbican {
     # Copy the barbican config files to the config dir
     cp $BARBICAN_DIR/etc/barbican/barbican-api.conf $BARBICAN_CONF_DIR
     cp $BARBICAN_DIR/etc/barbican/barbican-api-paste.ini $BARBICAN_CONF_DIR
-    cp $BARBICAN_DIR/etc/barbican/barbican-admin-paste.ini $BARBICAN_CONF_DIR
     cp -R $BARBICAN_DIR/etc/barbican/vassals $BARBICAN_CONF_DIR
 
     # Copy functional test config
@@ -213,7 +212,6 @@ function create_barbican_accounts {
             --region RegionOne \
             --service_id $BARBICAN_SERVICE \
             --publicurl "http://$SERVICE_HOST:9311" \
-            --adminurl "http://$SERVICE_HOST:9312" \
             --internalurl "http://$SERVICE_HOST:9311"
     fi
 
diff --git a/doc/source/setup/troubleshooting.rst b/doc/source/setup/troubleshooting.rst
index d21c00b41..c0151388f 100644
--- a/doc/source/setup/troubleshooting.rst
+++ b/doc/source/setup/troubleshooting.rst
@@ -137,7 +137,6 @@ What you might see
     spawned uWSGI master process (pid: 59190)
     spawned uWSGI worker 1 (pid: 59191, cores: 1)
     spawned uWSGI worker 1 (pid: 59192, cores: 1)
-    Loading paste environment: config:/etc/barbican/barbican-admin-paste.ini
     Loading paste environment: config:/etc/barbican/barbican-api-paste.ini
     WSGI app 0 (mountpoint='') ready in 0 seconds on interpreter \
         0x7fd098c08520 pid: 59191 (default app)
@@ -327,7 +326,6 @@ What you might see
 
     *** has_emperor mode detected (fd: 6) ***
     ...
-    [uWSGI] getting INI configuration from barbican-admin.ini
     !!! UNABLE to load uWSGI plugin: dlopen(./python_plugin.so, 10): image not \
     found !!!
     ...
@@ -337,7 +335,6 @@ What you might see
     2015, in load
       entry = __import__(self.module_name, globals(),globals(), ['__name__'])
     ImportError: No module named barbican.api.app
-    [emperor] removed uwsgi instance barbican-admin.ini
     ...
     *** Starting uWSGI 1.9.13 (64bit) on [Fri Jul  5 09:59:29 2013] ***
 
diff --git a/docs/src/docbkx/samples/resgenerateToken.json b/docs/src/docbkx/samples/resgenerateToken.json
index 094279eee..e3579f5a8 100644
--- a/docs/src/docbkx/samples/resgenerateToken.json
+++ b/docs/src/docbkx/samples/resgenerateToken.json
@@ -12,7 +12,6 @@
     },
     "serviceCatalog": [{
       "endpoints": [{
-        "adminURL": "http://localhost:9312",
         "region": "RegionOne",
         "internalURL": "http://localhost:9313",
         "publicURL": "http://localhost:9311"
diff --git a/etc/barbican/barbican-admin-paste.ini b/etc/barbican/barbican-admin-paste.ini
deleted file mode 100644
index e24b9fb72..000000000
--- a/etc/barbican/barbican-admin-paste.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[pipeline:main]
-pipeline = unauthenticated-context admin
-
-[app:admin]
-paste.app_factory = barbican.api.app:create_admin_app
-
-[filter:unauthenticated-context]
-paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMiddleware.factory
diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini
deleted file mode 100644
index cd8bc49af..000000000
--- a/etc/barbican/vassals/barbican-admin.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[uwsgi]
-socket = :9312
-protocol = http
-processes = 1
-lazy = true
-vacuum = true
-no-default-app = true
-memory-report = true
-plugins = python
-paste = config:/etc/barbican/barbican-admin-paste.ini
-add-header = Connection: close
diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh
index cd4f6e5de..1ffefbae5 100755
--- a/functionaltests/run_tests.sh
+++ b/functionaltests/run_tests.sh
@@ -16,18 +16,11 @@
 API_RESPONDING_TIMEOUT=20
 
 if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9311/ 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then
-    echo "The Barbican (non-admin) API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
+    echo "The Barbican API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
     exit 1
 fi
 
-echo "Successfully contacted the Barbican (non-admin) API"
-
-if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9312/ -HX-Project-Id:123 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then
-    echo "The Barbican (admin) API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
-    exit 1
-fi
-
-echo "Successfully contacted the Barbican (admin) API"
+echo "Successfully contacted the Barbican API"
 
 # Where tempest code lives
 TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}