diff --git a/Makefile b/Makefile
index 0ca66b779..386471606 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,8 @@ VPATH = $(SRCDIR)
 VERSION := $(shell git describe --tags --abbrev=0 --match 'v*')
 VERSION_NUM := $(shell VERSION=$(VERSION); echo $${VERSION:1})
 
+export BUILDDIR VARIANT VERSION VERSION_NUM
+
 ifdef CI
 	VARIANT := $(VARIANT)-ci
 
diff --git a/tools/integration-tests.sh b/tools/integration-tests.sh
index dcfa2cf6b..1c2934640 100755
--- a/tools/integration-tests.sh
+++ b/tools/integration-tests.sh
@@ -25,12 +25,8 @@
 SCRIPT=$(realpath ${BASH_SOURCE[0]})
 SCRIPTPATH=$(dirname $SCRIPT)
 
-if [ -n "${DEBUG}" ]; then
-	VARIANT="debug"
-else
-	VARIANT="release"
-fi
-
+VARIANTS=${VARIANTS:-"release"}
+VARIANT=${VARIANT:-$(uname -s)-$(uname -m)-$(echo ${VARIANTS} | tr ' ' '_')}
 SRCDIR=${SRCDIR:-$(realpath ${SCRIPTPATH}/..)}
 BUILDDIR=${BUILDDIR:-${SRCDIR}/build/${VARIANT}}