diff --git a/integration/scripts/functions_qemu b/integration/scripts/functions_qemu
index ac91efc853..e0cbac1966 100644
--- a/integration/scripts/functions_qemu
+++ b/integration/scripts/functions_qemu
@@ -38,7 +38,7 @@ function build_vm() {
     export GUEST_LOGDIR
     export ESCAPED_GUEST_LOGDIR
     export ELEMENTS_PATH=$TROVESTACK_SCRIPTS/files/elements
-    export ELEMENTS_PATH+=:$PATH_DISKIMAGEBUILDER/elements
+    export ELEMENTS_PATH+=:$PATH_DISKIMAGEBUILDER_ELEMENTS
     export ELEMENTS_PATH+=:$PATH_TRIPLEO_ELEMENTS/elements
     export DIB_CLOUD_INIT_DATASOURCES="ConfigDrive"
     export DATASTORE_PKG_LOCATION
@@ -46,7 +46,7 @@ function build_vm() {
     export DIB_APT_CONF_DIR=/etc/apt/apt.conf.d
     export DIB_CLOUD_INIT_ETC_HOSTS=true
     local QEMU_IMG_OPTIONS=$(! $(qemu-img | grep -q 'version 1') && echo "--qemu-img-options compat=0.10")
-    ${PATH_DISKIMAGEBUILDER}/bin/disk-image-create -a amd64 -o "${VM}" \
+    disk-image-create -a amd64 -o "${VM}" \
         -x ${QEMU_IMG_OPTIONS} ${DISTRO} ${EXTRA_ELEMENTS} vm heat-cfntools \
         cloud-init-datasources ${DISTRO}-${RELEASE}-guest ${DISTRO}-${RELEASE}-${SERVICE_TYPE}
 }
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index 8982c2fa69..546468863f 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -51,7 +51,7 @@ PATH_OPENSTACKCLIENT=$DEST/python-openstackclient
 PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient
 PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient
 PATH_TROVE_DASHBOARD=$DEST/trove-dashboard
-PATH_DISKIMAGEBUILDER=$DEST/diskimage-builder
+PATH_DISKIMAGEBUILDER_ELEMENTS=$(python -c 'import os, diskimage_builder, pkg_resources;print(os.path.abspath(pkg_resources.resource_filename(diskimage_builder.__name__, "elements")))')
 PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements
 
 # Save the state of TROVE_BRANCH first, since it's used in trovestack
diff --git a/requirements.txt b/requirements.txt
index e87358782f..9a8e961613 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -47,3 +47,4 @@ enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' #
 xmltodict>=0.10.1 # MIT
 pycrypto>=2.6 # Public Domain
 oslo.policy>=1.17.0 # Apache-2.0
+diskimage-builder>=1.1.2,!=1.6.0,!=1.7.0,!=1.7.1  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 310629db6e..4b294691f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -72,7 +72,7 @@ commands = {posargs}
 show-source = True
 # H301 is ignored on purpose.
 # The rest of the ignores are TODOs.
-ignore = F821,H301,H404,H405,H501
+ignore = F821,H301,H404,H405,H501,E402,W503,E731
 enable-extensions = H203,H106
 builtins = _
 exclude=.venv,.tox,.git,dist,doc,*egg,tools,etc,build,*.po,*.pot,integration,releasenotes