diff --git a/python-urllib3.changes b/python-urllib3.changes
index 42e19eb..85640df 100644
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Aug  8 06:57:44 UTC 2017 - tbechtold@suse.com
+
+- update to 1.22:
+  * Fixed missing brackets in ``HTTP CONNECT`` when connecting to IPv6 address via
+    IPv6 proxy. (Issue #1222)
+  * Made the connection pool retry on ``SSLError``.  The original ``SSLError``
+    is available on ``MaxRetryError.reason``. (Issue #1112)
+  * Drain and release connection before recursing on retry/redirect.  Fixes
+    deadlocks with a blocking connectionpool. (Issue #1167)
+  * Fixed compatibility for cookiejar. (Issue #1229)
+  * pyopenssl: Use vendored version of ``six``. (Issue #1231)
+- use pytest for running the tests. That is what upstream is doing
+
 -------------------------------------------------------------------
 Sat Jun 10 08:10:33 UTC 2017 - dmueller@suse.com
 
diff --git a/python-urllib3.spec b/python-urllib3.spec
index dd505e4..5773c36 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -18,7 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-urllib3
-Version:        1.21.1
+Version:        1.22
 Release:        0
 Summary:        HTTP library with thread-safe connection pooling, file post, and more
 License:        MIT
@@ -38,8 +38,8 @@ BuildRequires:  %{python_module PySocks}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module mock >= 1.3.0}
 BuildRequires:  %{python_module nose >= 1.3.7}
-BuildRequires:  %{python_module nose-exclude >= 0.4.1}
 BuildRequires:  %{python_module psutil}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module tornado >= 4.2.1}
 Recommends:     python-pyOpenSSL
 Recommends:     python-cryptography
@@ -84,19 +84,11 @@ Highlights
 rm -rf build
 # pretend to be TRAVIS (this triggers timing tolerance)
 export TRAVIS=1
-%{python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" $python -m nose \
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_https_proxy_timeout \
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_https_proxy_pool_timeout \
-%if 0%{?suse_version} && 0%{?suse_version} <= 1320
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestIPv6HTTPProxyManager.test_basic_ipv6_proxy \
-%endif
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_headerdict \
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_headers \
-	--exclude-test=test.with_dummyserver.test_poolmanager.TestPoolManager.test_headers \
-	--exclude-test=test.with_dummyserver.test_https.TestHTTPS_IPv6Addr \
-	--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestIPv6HTTPProxyManager \
-	--exclude-test=test.with_dummyserver.test_https.TestHTTPS_IPSAN
-}
+%{python_expand PYTHONPATH="%{buildroot}%{$python_sitelib}" py.test \
+                --ignore=test/appengine \
+                --ignore=test/with_dummyserver/test_proxy_poolmanager.py \
+                --ignore=test/with_dummyserver/test_poolmanager.py \
+                urllib3 test}
 
 %files %{python_files}
 %defattr(-,root,root,-)
diff --git a/urllib3-1.21.1.tar.gz b/urllib3-1.21.1.tar.gz
deleted file mode 100644
index 7d0844c..0000000
--- a/urllib3-1.21.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5
-size 224266
diff --git a/urllib3-1.22.tar.gz b/urllib3-1.22.tar.gz
new file mode 100644
index 0000000..558840e
--- /dev/null
+++ b/urllib3-1.22.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
+size 226083