diff --git a/tests/group_vars/keystone_all.yml b/tests/group_vars/keystone_all.yml
deleted file mode 100644
index 5c96c43b..00000000
--- a/tests/group_vars/keystone_all.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-lxc_container_bind_mounts:
-  - host_directory: "{{ keystone_dev_local_directory | default('/opt/keystone') }}"
-    container_directory: "/opt/keystone"
diff --git a/tests/os_keystone-overrides.yml b/tests/os_keystone-overrides.yml
index 4b68f70d..0c8dfae0 100644
--- a/tests/os_keystone-overrides.yml
+++ b/tests/os_keystone-overrides.yml
@@ -16,10 +16,6 @@
 # (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 
-keystone_git_repo: "file:///opt/keystone"
-keystone_dev_clone_repo: "https://git.openstack.org/openstack/keystone"
-keystone_dev_force_clone: False
-
 tempest_run: yes
 
 tempest_plugins:
diff --git a/tests/test-clone-repo.yml b/tests/test-clone-repo.yml
deleted file mode 100644
index d5a3e800..00000000
--- a/tests/test-clone-repo.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# Copyright 2017, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Clone keystone repository if it doesn't exist
-  hosts: localhost
-  user: root
-  become: true
-  pre_tasks:
-    - name: Clone the repo
-      git:
-        repo: "{{ keystone_dev_clone_repo }}"
-        dest: "{{ keystone_dev_local_directory | default('/opt/keystone') }}"
-        version: "{{ keystone_dev_git_branch | default('master') }}"
-      register: git_clone
-      until: git_clone|success
diff --git a/tests/test-upgrade-post.yml b/tests/test-upgrade-post.yml
index 16a149d9..71af132c 100644
--- a/tests/test-upgrade-post.yml
+++ b/tests/test-upgrade-post.yml
@@ -19,9 +19,6 @@
 # Install upgrade benchmarking
 - include: test-benchmark-keystone-upgrade.yml
 
-# Update repo
-- include: test-clone-repo.yml
-
 # Install Keystone
 - include: common/test-install-keystone.yml
 
diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml
index b0b96a0f..76c36eea 100644
--- a/tests/test-upgrade-pre.yml
+++ b/tests/test-upgrade-pre.yml
@@ -22,11 +22,6 @@
 # Prepare the host
 - include: common/test-prepare-host.yml
 
-# Clone the repo
-- include: test-clone-repo.yml
-  vars:
-    keystone_dev_git_branch: "stable/ocata"
-
 # Prepare the containers
 - include: common/test-prepare-containers.yml
 
diff --git a/tests/test.yml b/tests/test.yml
index fdff1af6..d506503d 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -19,12 +19,6 @@
 # Prepare the host
 - include: common/test-prepare-host.yml
 
-# Clone repository
-- include: test-clone-repo.yml
-  when: >
-    keystone_dev_local_directory is not defined or
-    keystone_dev_force_clone
-
 # Prepare the containers
 - include: common/test-prepare-containers.yml