diff --git a/requirements.txt b/requirements.txt
index a21537a6..50cd9ed5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,9 +5,7 @@ setuptools>=17.1
 # setuptools needs to be upgraded below to ensure we have
 # a new enough setuptools version to support using >=
 # for the python_version marker
-tempest
 #crudini>=0.9.3
-oslo.log
 sshtunnel<=0.1.3;python_version=='2.7' # MIT
 sshtunnel;python_version>='3.6' # MIT
 pymysql
diff --git a/test-requirements.txt b/test-requirements.txt
index 07ff7987..f1fde015 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,3 +10,12 @@ mock
 oslotest
 pycodestyle>=2.0.0,<2.6.0 # MIT
 stestr<=2.6.0;python_version=='2.7' # MIT
+# Tempest and oslo.log are actually runtime requirements (obviously), so they
+# should be in requirements.txt. However, in order to support deployments where
+# Tempest is installed from RPM and might conflict with a pip installation of
+# whitebox and Tempest, it was removed from requirements.txt. This means that
+# it had to be added here, to make sure it got installed for any tox jobs (like
+# unit tests and pep8) that don't have something like devstack installing
+# Tempest beforehand. oslo.log is in the same boat.
+tempest
+oslo.log