diff --git a/tools/Makefile b/tools/Makefile
index 6430bfb419..b07203e2a2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -127,7 +127,6 @@ subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qem
 
 subdir-clean-qemu-xen-traditional-dir:
 	set -e; if test -d qemu-xen-traditional-dir/.; then \
-		$(buildmakevars2shellvars); \
 		$(MAKE) -C qemu-xen-traditional-dir clean; \
 	fi
 
@@ -162,7 +161,6 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
 
 subdir-clean-qemu-xen-dir:
 	set -e; if test -d qemu-xen-dir/.; then \
-		$(buildmakevars2shellvars); \
 		$(MAKE) -C qemu-xen-dir clean; \
 	fi
 
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 5d40bcd2f8..696c7afc67 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -55,3 +55,8 @@ seabios-dir-force-update:
 		$(GIT) fetch origin; \
 		$(GIT) reset --hard $(SEABIOS_UPSTREAM_TAG); \
 	fi
+
+subdir-clean-seabios-dir:
+	set -e; if test -d seabios-dir/.; then \
+		$(MAKE) -C seabios-dir clean; \
+	fi