diff --git a/manual-test.rc b/manual-test.rc
new file mode 100644
index 00000000..fa1cdf95
--- /dev/null
+++ b/manual-test.rc
@@ -0,0 +1,22 @@
+export VIRTUAL_ENV=$(pwd)
+export ANSIBLE_HOST_KEY_CHECKING=False
+export ANSIBLE_SSH_CONTROL_PATH=/tmp/%%h-%%r
+
+# TODO (odyssey4me) These are only here as they are non-standard folder
+# names for Ansible 1.9.x. We are using the standard folder names for
+# Ansible v2.x. We can remove this when we move to Ansible 2.x.
+export ANSIBLE_ACTION_PLUGINS=${HOME}/.ansible/plugins/action
+export ANSIBLE_CALLBACK_PLUGINS=${HOME}/.ansible/plugins/callback
+export ANSIBLE_FILTER_PLUGINS=${HOME}/.ansible/plugins/filter
+export ANSIBLE_LOOKUP_PLUGINS=${HOME}/.ansible/plugins/lookup
+
+# This is required as the default is the current path or a path specified
+# in ansible.cfg
+export ANSIBLE_LIBRARY=${HOME}/.ansible/plugins/library
+
+# This is required as the default is '/etc/ansible/roles' or a path
+# specified in ansible.cfg
+export ANSIBLE_ROLES_PATH=${HOME}/.ansible/roles:$(pwd)/..
+
+echo "Run manual functional tests by executing the following:"
+echo "# ./.tox/functional/bin/ansible-playbook -i tests/inventory tests/test.yml -e \"rolename=$(pwd)\""
diff --git a/meta/main.yml b/meta/main.yml
index 99fa0677..8d1fe00c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,6 +23,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - trusty
+        - xenial
   categories:
     - cloud
     - python
diff --git a/tasks/main.yml b/tasks/main.yml
index 64f88dbd..21e8c516 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,6 +56,12 @@
     - horizon-install
     - horizon-config
 
+- name: Update the ca certificates
+  command: "update-ca-certificates -f"
+  when: not horizon_external_ssl|bool
+  tags:
+    - horizon-ssl
+
 - include: horizon_service_setup.yml
   tags:
     - horizon-install
diff --git a/tests/test-container-create.yml b/tests/test-container-create.yml
index 6e2fe833..850a6b4a 100644
--- a/tests/test-container-create.yml
+++ b/tests/test-container-create.yml
@@ -15,7 +15,6 @@
 
 - name: Create test containers
   hosts: all_containers
-  connection: local
   gather_facts: false
   pre_tasks:
     - name: Destroy test containers
@@ -51,4 +50,4 @@
         port: "{{ ansible_ssh_port | default('22') }}"
         host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
         search_regex: OpenSSH
-        delay: 1
\ No newline at end of file
+        delay: 1
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index 56ed7d0f..84275477 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -61,8 +61,8 @@ memcached_servers: 127.0.0.1
 openrc_os_auth_url: "http://127.0.0.1:5000/v3"
 openrc_os_domain_name: "Default"
 openrc_os_password: "{{ keystone_auth_admin_password }}"
-tempest_dashboard_login_url: "https://10.100.100.4/auth/login/"
-tempest_dashboard_url: "https://10.100.100.4/"
+tempest_dashboard_login_url: "https://{{ ansible_hostname }}/auth/login/"
+tempest_dashboard_url: "https://{{ ansible_hostname }}/"
 tempest_developer_mode: True
 tempest_git_install_branch: master
 tempest_venv_tag: "{{ tempest_git_install_branch }}"
diff --git a/vars/debian.yml b/vars/debian.yml
index 837f71b7..94610d47 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -20,6 +20,7 @@ horizon_apt_packages:
   - apache2
   - apache2-utils
   - cron # required by the Ansible cron module
+  - git
   - libapache2-mod-wsgi
   - libssl-dev
   - libxslt1.1