diff --git a/test/images/agnhost/Makefile b/test/images/agnhost/Makefile
index c5eeeea4162..943f68d4b06 100644
--- a/test/images/agnhost/Makefile
+++ b/test/images/agnhost/Makefile
@@ -16,6 +16,7 @@ SRCS=agnhost
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/apparmor-loader/Makefile b/test/images/apparmor-loader/Makefile
index c0b6bd8e481..0f6fe15bda0 100644
--- a/test/images/apparmor-loader/Makefile
+++ b/test/images/apparmor-loader/Makefile
@@ -16,6 +16,7 @@ SRCS=loader
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/metadata-concealment/Makefile b/test/images/metadata-concealment/Makefile
index 48708b14e71..631867d2044 100644
--- a/test/images/metadata-concealment/Makefile
+++ b/test/images/metadata-concealment/Makefile
@@ -16,6 +16,7 @@ SRCS=check_metadata_concealment
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/nonewprivs/Makefile b/test/images/nonewprivs/Makefile
index 255eadd5d6c..7618c48ba05 100644
--- a/test/images/nonewprivs/Makefile
+++ b/test/images/nonewprivs/Makefile
@@ -16,6 +16,7 @@ SRCS = nnp
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/pets/peer-finder/Makefile b/test/images/pets/peer-finder/Makefile
index 773b4167cc7..bf97d373654 100644
--- a/test/images/pets/peer-finder/Makefile
+++ b/test/images/pets/peer-finder/Makefile
@@ -16,6 +16,7 @@ SRCS = peer-finder
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/pets/redis-installer/Makefile b/test/images/pets/redis-installer/Makefile
index 773b4167cc7..bf97d373654 100644
--- a/test/images/pets/redis-installer/Makefile
+++ b/test/images/pets/redis-installer/Makefile
@@ -16,6 +16,7 @@ SRCS = peer-finder
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/pets/zookeeper-installer/Makefile b/test/images/pets/zookeeper-installer/Makefile
index 773b4167cc7..bf97d373654 100644
--- a/test/images/pets/zookeeper-installer/Makefile
+++ b/test/images/pets/zookeeper-installer/Makefile
@@ -16,6 +16,7 @@ SRCS = peer-finder
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = pets/peer-finder
 export
diff --git a/test/images/resource-consumer/Makefile b/test/images/resource-consumer/Makefile
index b5102ba1679..e0c5fd81e39 100644
--- a/test/images/resource-consumer/Makefile
+++ b/test/images/resource-consumer/Makefile
@@ -16,6 +16,7 @@ SRCS = consumer consume-cpu/consume-cpu
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export
diff --git a/test/images/sample-device-plugin/Makefile b/test/images/sample-device-plugin/Makefile
index c3fa3cb23e4..117284eaa11 100644
--- a/test/images/sample-device-plugin/Makefile
+++ b/test/images/sample-device-plugin/Makefile
@@ -16,6 +16,7 @@ SRCS=sampledeviceplugin
 OS ?= linux
 ARCH ?= amd64
 TARGET ?= $(CURDIR)
+GOARM ?= 7
 GOLANG_VERSION ?= latest
 SRC_DIR = $(notdir $(shell pwd))
 export