diff --git a/requirements.txt b/requirements.txt
index 92517a6..8013bd0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 
 # Note the following is not in global-requirements but this repo is
-# not using global-requirements in general.
-yasfb>=0.5.1
+# not used in repositories in general.
+yasfb>=0.6.1
diff --git a/tox.ini b/tox.ini
index cd5dc77..d7d1bab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,15 +13,9 @@ install_command = pip install -U {opts} {packages}
 commands = doc8 -e .rst specs/ doc/ README.rst
 
 [testenv:venv]
-# NOTE(stephenfin): Use Python 2.7 due to same issue 'docs' env because the
-# gate builds docs this way
-basepython = python2.7
 commands = {posargs}
 
 [testenv:docs]
-# NOTE(stephenfin): Use Python 2.7 until 'yasfb' is Python 3 compliant or is
-# removed -- https://github.com/dhellmann/yasfb/issues/1
-basepython = python2.7
 commands =
   doc8 -e .rst specs/ doc/ README.rst
   sphinx-build -W -b html doc/source doc/build