diff --git a/pyproject.toml b/pyproject.toml
index 9fefd553..cdf7e3b7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,8 +2,7 @@
 dependencies = [
     "distro",
     "imaplib2>=3.5",
-    "rfc6555",
-    "urllib3~=1.25.9"
+    "rfc6555"
 ]
 name = "offlineimap"
 version = "8.0.1"
@@ -47,10 +46,11 @@ requires = [
 ]
 
 [project.optional-dependencies]
-keyring = ["keyring"]
 cygwin = ["portalocker[cygwin]"]
 kerberos = ["gssapi[kerberos]"]
-testinternet = ["certifi~=2020.6.20"]
+keyring = ["keyring"]
+pysocks = ["pysocks"]
+testinternet = ["certifi~=2020.6.20", "urllib3~=1.25.9"]
 
 [project.scripts]
 offlineimap = "offlineimap.init:main"
diff --git a/requirements-pysocks.txt b/requirements-pysocks.txt
new file mode 100644
index 00000000..a080b130
--- /dev/null
+++ b/requirements-pysocks.txt
@@ -0,0 +1 @@
+pysocks
diff --git a/requirements-certify.txt b/requirements-testinternet.txt
similarity index 54%
rename from requirements-certify.txt
rename to requirements-testinternet.txt
index edab3f47..77e63991 100644
--- a/requirements-certify.txt
+++ b/requirements-testinternet.txt
@@ -1 +1,2 @@
 certifi~=2020.6.20
+urllib3~=1.25.9
diff --git a/requirements.txt b/requirements.txt
index 9070773b..69714187 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,3 @@
 rfc6555
 distro; python_version > "3.6"
 imaplib2>=3.5
-urllib3~=1.25.9
diff --git a/setup.py b/setup.py
index 9bf3be1b..4780507b 100644
--- a/setup.py
+++ b/setup.py
@@ -86,11 +86,11 @@
       license=copyright + ", Licensed under the GPL version 2",
       install_requires=['distro',
                         'imaplib2>=3.5',
-                        'rfc6555',
-                        'urllib3~=1.25.9'],
-      extras_require={'kerberos':'gssapi[kerberos]',
-                      'keyring':'keyring[keyring]',
-                      'cygwin':'portalocker[cygwin]',
-                      'testinternet':'certifi~=2020.6.20'}
+                        'rfc6555'],
+      extras_require={'cygwin':'portalocker[cygwin]',
+                      'kerberos':'gssapi[kerberos]',
+                      'keyring':'keyring',
+                      'pysocks':'pysocks',
+                      'testinternet':['certifi~=2020.6.20', 'urllib3~=1.25.9']}
       )