diff --git a/.travis/config.sh b/.travis/config.sh
index 2ca77d3..41caaf3 100644
--- a/.travis/config.sh
+++ b/.travis/config.sh
@@ -1,10 +1,10 @@
 export LSR_MOLECULE_DEPS='-rmolecule_requirements.txt'
 
-case "x${TRAVIS_PYTHON_VERSION}" in
-  x3.5)
+case "${TRAVIS_PYTHON_VERSION}" in
+  3.5)
     LSR_EXTRA_PACKAGES='python3-selinux'
     ;;
-  x3.6|x)
+  3.6|"")
     # Set these also if we are running locally:
     export LSR_TEXTRA_DEPS='PyYAML'
     export LSR_TEXTRA_DIR='tests'
diff --git a/.travis/preinstall b/.travis/preinstall
index 8e40ae5..b69d098 100755
--- a/.travis/preinstall
+++ b/.travis/preinstall
@@ -9,7 +9,7 @@ if [[ -f ${CONFIG} ]]; then
   . ${CONFIG}
 fi
 
-if [[ "x${LSR_EXTRA_PACKAGES}" != "x" ]]; then
+if [[ "${LSR_EXTRA_PACKAGES}" ]]; then
   sudo apt-get update
   sudo apt-get install -y ${LSR_EXTRA_PACKAGES}
 fi
diff --git a/.travis/runtox b/.travis/runtox
index 5dc1849..b37df19 100755
--- a/.travis/runtox
+++ b/.travis/runtox
@@ -10,10 +10,6 @@ if [[ -f ${CONFIG} ]]; then
 fi
 
 tox "$@"
-if [[ "x${LSR_MSCENARIOS}" != "x" ]]; then
-  for X in ${LSR_MSCENARIOS}; do
-    LSR_MSCENARIO=${X} tox -e molecule_lint
-    LSR_MSCENARIO=${X} tox -e molecule_syntax
-    LSR_MSCENARIO=${X} tox -e molecule_test
-  done
-fi
+for X in ${LSR_MSCENARIOS}; do
+  LSR_MSCENARIO=${X} tox -e molecule
+done