diff --git a/Makefile b/Makefile
index 81b66873..50637c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,6 @@ uninstall-httpie:
 ###############################################################################
 
 pdf:
-	# NOTE: rst2pdf needs to be installed manually and against a Python 2
 	@echo "Converting README.rst to PDF…"
 	rst2pdf \
 		--strip-elements-with-class=no-pdf \
diff --git a/httpie/cli/constants.py b/httpie/cli/constants.py
index c75fafde..a97ac252 100644
--- a/httpie/cli/constants.py
+++ b/httpie/cli/constants.py
@@ -2,7 +2,6 @@
 
 """
 import re
-import ssl
 
 
 # TODO: Use MultiDict for headers once added to `requests`.
diff --git a/httpie/cli/definition.py b/httpie/cli/definition.py
index 2b171672..76c1d6ca 100644
--- a/httpie/cli/definition.py
+++ b/httpie/cli/definition.py
@@ -643,7 +643,7 @@ ssl.add_argument(
     '''
 )
 ssl.add_argument(
-    '--ssl',  # TODO: Maybe something more general, such as --secure-protocol?
+    '--ssl',
     dest='ssl_version',
     choices=list(sorted(AVAILABLE_SSL_VERSION_ARG_MAPPING.keys())),
     help='''
diff --git a/tests/test_docs.py b/tests/test_docs.py
index 7a418228..340e64d5 100644
--- a/tests/test_docs.py
+++ b/tests/test_docs.py
@@ -40,13 +40,17 @@ assert filenames
 
 
 # HACK: hardcoded paths, venv should be irrelevant, etc.
-# TODO: replaces the process with Python code
+# TODO: simplify by using the Python API instead of a subprocess
+#       then we wont’t need the paths.
 VENV_BIN = Path(__file__).parent.parent / 'venv/bin'
 VENV_PYTHON = VENV_BIN / 'python'
 VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py'
 
 
-@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed')
+@pytest.mark.skipif(
+    not VENV_RST2PSEUDOXML.exists(),
+    reason='docutils not installed',
+)
 @pytest.mark.parametrize('filename', filenames)
 def test_rst_file_syntax(filename):
     p = subprocess.Popen(
diff --git a/tests/test_httpie.py b/tests/test_httpie.py
index 48af0757..19ec914e 100644
--- a/tests/test_httpie.py
+++ b/tests/test_httpie.py
@@ -46,7 +46,6 @@ def test_help():
 def test_version():
     r = http('--version', tolerate_error_exit_status=True)
     assert r.exit_status == ExitStatus.SUCCESS
-    # FIXME: py3 has version in stdout, py2 in stderr
     assert httpie.__version__ == r.strip()
 
 
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 3ee94d84..3bb625d3 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -27,7 +27,6 @@ CLIENT_KEY = str(CERTS_ROOT / 'client.key')
 CLIENT_PEM = str(CERTS_ROOT / 'client.pem')
 
 
-# FIXME:
 # We test against a local httpbin instance which uses a self-signed cert.
 # Requests without --verify=<CA_BUNDLE> will fail with a verification error.
 # See: https://github.com/kevin1024/pytest-httpbin#https-support