diff --git a/centos/Dockerfile b/centos/Dockerfile
index 0177b41..e17348d 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -1,5 +1,6 @@
 FROM centos:7
 
+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:centos
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
diff --git a/centos/override/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud b/centos/override/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
similarity index 100%
rename from centos/override/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
rename to centos/override/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/centos/testvars b/centos/testvars
new file mode 100644
index 0000000..50b9561
--- /dev/null
+++ b/centos/testvars
@@ -0,0 +1,2 @@
+export PROJECT=ironic
+export DISTRO=centos
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 15b7313..408b1b6 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -1,5 +1,6 @@
 FROM debian:jessie-slim
 
+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:debian
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
diff --git a/debian/testvars b/debian/testvars
new file mode 100644
index 0000000..727eb6e
--- /dev/null
+++ b/debian/testvars
@@ -0,0 +1,2 @@
+export PROJECT=nova
+export DISTRO=debian
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index edd717c..3dc6ad0 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,5 +1,6 @@
 FROM ubuntu:xenial
 
+ENV PATH=/var/lib/openstack/bin:$PATH
 ENV PROJECT=ironic
 ARG WHEELS=openstackloci/requirements:ubuntu
 ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
diff --git a/ubuntu/testvars b/ubuntu/testvars
new file mode 100644
index 0000000..8114ccb
--- /dev/null
+++ b/ubuntu/testvars
@@ -0,0 +1,2 @@
+export PROJECT=ironic
+export DISTRO=ubuntu