diff --git a/roles/install-golang/tasks/main.yml b/roles/install-golang/tasks/main.yml
index 33dd522eedb7b..28cf8fb917f36 100644
--- a/roles/install-golang/tasks/main.yml
+++ b/roles/install-golang/tasks/main.yml
@@ -1,24 +1,16 @@
 ---
-- name: Register the current Go version
-  command: /usr/local/go/bin/go version
-  ignore_errors: yes
-  register: go_version
-
 - name: Download the Go tarball
   get_url:
     url: '{{ go_download_location }}'
     dest: '/usr/local/src/{{ go_tarball }}'
-  when: go_version|failed
 
 - name: Remove old installation of Go
   file:
     path: /usr/local/go
     state: absent
-  when: go_version|failed
 
-- name: Extract the Go tarball if Go is not yet installed
+- name: Extract the Go tarball to place
   unarchive:
     src: '/usr/local/src/{{ go_tarball }}'
     dest: /usr/local
     remote_src: yes
-  when: go_version|failed
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9ba2b9b0bc777..707e519642504 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -20,7 +20,7 @@
     vars:
       golang_env:
         GOPATH: '{{ ansible_user_dir }}'
-        PATH: '{{ ansible_env.PATH }}:/usr/local/go/bin:{{ ansible_user_dir }}/bin'
+        PATH: '/usr/local/go/bin:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}'
         TEST_RESULTS_TXT: '{{ ansible_user_dir }}/workspace/test_results.txt'
         TEST_RESULTS_XML: '{{ ansible_user_dir }}/workspace/test_results.xml'
         TEST_RESULTS_HTML: '{{ ansible_user_dir }}/workspace/test_results.html'