diff --git a/Makefile.buildtests b/Makefile.buildtests
index 4a80aa47e1a95d1a1c06cd4e0483293d17ce48c7..bee3885ee88652a4053c3c3a74265594fe0cc3cc 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -31,6 +31,9 @@ endif
         info-buildsizes-diff info-build info-boards-supported \
         info-features-missing info-boards-features-missing
 
+ifeq ($(BUILD_IN_DOCKER),1)
+buildtest: ..in-docker-container
+else
 buildtest:
 	@ \
 	BUILDTESTOK=true; \
@@ -66,6 +69,7 @@ buildtest:
 		done; \
 	done; \
 	$${BUILDTESTOK}
+endif # BUILD_IN_DOCKER
 
 info-objsize:
 	@case "${SORTROW}" in \
diff --git a/Makefile.docker b/Makefile.docker
index 1cfffbc4d7684e586171ffae4db380875ebb104a..5dd2021429ee63c49188c16fba9e87b7e753d4f5 100644
--- a/Makefile.docker
+++ b/Makefile.docker
@@ -4,6 +4,7 @@ export DOCKER_FLAGS ?= --rm
 # List of Docker-enabled make goals
 export DOCKER_MAKECMDGOALS_POSSIBLE = \
   all \
+  buildtest \
   #
 export DOCKER_MAKECMDGOALS = $(filter $(MAKECMDGOALS),$(DOCKER_MAKECMDGOALS_POSSIBLE))