diff --git a/swift3/test/functional/common.filter b/swift3/test/functional/common.filter
index 7e7538d7..b7e0d37b 100644
--- a/swift3/test/functional/common.filter
+++ b/swift3/test/functional/common.filter
@@ -116,16 +116,9 @@ _filter_header_content_length()
     sed -e 's/^Content-Length: [0-9]*$/Content-Length: LENGTH/g'
 }
 
-# This is not necessary after Swift merge swift3 patch
-_filter_header_capitalization()
-{
-    perl -pe '$_=lc($&).$'\'' if /^x-(amz|rgw)-.+?:/i' | \
-	perl -pe '$_="ETag:".$'\'' if /^etag:/i'
-}
-
 _filter_header()
 {
-    _filter_header_capitalization | _filter_header_date | _filter_user | \
+    _filter_header_date | _filter_user | \
 	_filter_upload_id | _filter_version_id | _filter_txid | _filter_etag | \
 	_filter_timestamp | _filter_header_content_length
 }
diff --git a/tox.ini b/tox.ini
index 4ad79a1d..af64f815 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
   -r{toxinidir}/test-requirements.txt
-  https://launchpad.net/swift/juno/2.0.0/+download/swift-2.0.0.tar.gz
+  https://launchpad.net/swift/juno/2.1.0/+download/swift-2.1.0.tar.gz
 commands = nosetests {posargs:swift3/test/unit}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1