diff --git a/swift3/test/functional/conf/keystone-paste.ini b/swift3/test/functional/conf/keystone-paste.ini
index b9515747..a961a35c 100644
--- a/swift3/test/functional/conf/keystone-paste.ini
+++ b/swift3/test/functional/conf/keystone-paste.ini
@@ -48,9 +48,6 @@ paste.filter_factory = keystone.contrib.revoke.routers:RevokeExtension.factory
 [filter:url_normalize]
 paste.filter_factory = keystone.middleware:NormalizingFilter.factory
 
-[filter:sizelimit]
-paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory
-
 [filter:stats_monitoring]
 paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory
 
@@ -70,13 +67,13 @@ paste.app_factory = keystone.service:v3_app_factory
 paste.app_factory = keystone.service:admin_app_factory
 
 [pipeline:public_api]
-pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service
+pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension user_crud_extension public_service
 
 [pipeline:admin_api]
-pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service
+pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension s3_extension crud_extension admin_service
 
 [pipeline:api_v3]
-pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension service_v3
+pipeline = url_normalize build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension service_v3
 
 [app:public_version_service]
 paste.app_factory = keystone.service:public_version_app_factory
@@ -85,10 +82,10 @@ paste.app_factory = keystone.service:public_version_app_factory
 paste.app_factory = keystone.service:admin_version_app_factory
 
 [pipeline:public_version_api]
-pipeline = sizelimit url_normalize public_version_service
+pipeline = url_normalize public_version_service
 
 [pipeline:admin_version_api]
-pipeline = sizelimit url_normalize admin_version_service
+pipeline = url_normalize admin_version_service
 
 [composite:main]
 use = egg:Paste#urlmap
diff --git a/swift3/test/functional/conf/keystone.conf.in b/swift3/test/functional/conf/keystone.conf.in
index 494f29d9..09fdb737 100644
--- a/swift3/test/functional/conf/keystone.conf.in
+++ b/swift3/test/functional/conf/keystone.conf.in
@@ -1,5 +1,6 @@
 [DEFAULT]
 policy_file=%CONF_DIR%/policy.json
+admin_token = ADMIN
 
 [database]
 
diff --git a/tox.ini b/tox.ini
index 822ca0a1..1c1801a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,10 +7,10 @@ skipsdist = True
 whitelist_externals =/bin/bash
 usedevelop = True
 install_command = pip install {opts} {packages}
+# swift 2.7.0 from github
 deps =
   -r{toxinidir}/test-requirements.txt
-  PyECLib==1.0.7
-  https://launchpad.net/swift/kilo/2.3.0/+download/swift-2.3.0.tar.gz
+  http://tarballs.openstack.org/swift/swift-2.7.0.tar.gz
 commands = nosetests {posargs:swift3/test/unit}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
@@ -29,9 +29,10 @@ setenv = AUTH=tempauth
 [testenv:keystone]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=keystone
+# keystone 9.0.0 from github
 deps =
   {[testenv]deps}
-  https://launchpad.net/keystone/kilo/2015.1.0/+download/keystone-2015.1.0.tar.gz
+  http://tarballs.openstack.org/keystone/keystone-9.0.0.tar.gz
 
 [testenv:s3acl]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}