diff --git a/README.md b/README.md
index 1383cdbee..47f0494c8 100644
--- a/README.md
+++ b/README.md
@@ -202,6 +202,7 @@ This is the current matrix of available tests:
 | horizon    |      X      |             |             |
 | manila     |      X      |             |             |
 | nagios     |      X      |             |             |
+| SSL        |      X      |             |             |
 
 To run these tests:
 
diff --git a/run_tests.sh b/run_tests.sh
index 1c496709b..31e48f11c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -216,6 +216,10 @@ else
   $SUDO yum -y install openstack-packstack
 fi
 
+# Make sure the fqdn is associated to the IP in /etc/hosts
+# Needed for Horizon SSL tests in Tempest
+echo -e "\n127.0.0.1 $(facter fqdn)" | $SUDO tee -a /etc/hosts
+
 # Generate configuration from selected scenario and run it
 source ./tests/${SCENARIO}.sh
 result=$?
diff --git a/tests/scenario001.sh b/tests/scenario001.sh
index baf8da8b2..b514e27bd 100755
--- a/tests/scenario001.sh
+++ b/tests/scenario001.sh
@@ -24,6 +24,8 @@ $SUDO packstack --allinone \
           --os-gnocchi-install=n \
           --os-swift-install=n \
           --os-manila-install=y \
+          --os-horizon-ssl=y \
+          --amqp-enable-ssl=y \
           --glance-backend=file \
           --provision-demo=y \
           --provision-tempest=y \