diff -Naur VirtualBox-4.2.4/Config.kmk VirtualBox-4.2.4/Config.kmk
--- VirtualBox-4.2.4/Config.kmk
+++ VirtualBox-4.2.4/Config.kmk
@@ -547,6 +547,10 @@
 VBOX_WITH_TESTSUITE = 1
 # Build the testcases.
 VBOX_WITH_TESTCASES = 1
+# Enable this to build vditool even if VBOX_WITH_TESTCASES is disabled
+VBOX_WITH_VDI_TOOL = 1
+# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
+VBOX_WITH_VBOX_IMG = 1
 # Enables the ffmpeg module for recording test runs.
 # TODO: Enable this for normal build server builds?
 #if1of ($(KBUILD_TARGET), linux)
diff -Naur VirtualBox-4.2.4/src/VBox/Storage/testcase/Makefile.kmk VirtualBox-4.2.4.new/src/VBox/Storage/testcase/Makefile.kmk
--- VirtualBox-4.2.4/src/VBox/Storage/testcase/Makefile.kmk	2012-10-26 16:25:08.000000000 +0000
+++ VirtualBox-4.2.4.new/src/VBox/Storage/testcase/Makefile.kmk	2012-11-18 19:06:14.463822620 +0000
@@ -22,7 +22,7 @@
 # vditool - useful too for manipulating VDIs, but now pretty obsolete and
 # probably will go away soon. Testcase only now.
 #
-ifdef VBOX_WITH_TESTCASES
+if defined (VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VDITOOL)
  PROGRAMS += vditool
   vditool_TEMPLATE = VBOXR3TSTEXE
   vditool_LIBS     = $(LIB_DDU)
@@ -33,7 +33,7 @@
 # Basic testcases for the VD code.
 #
 ifdef VBOX_WITH_TESTCASES
- PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable vbox-img
+ PROGRAMS += tstVD tstVD-2 tstVDCopy tstVDSnap tstVDShareable
 
  tstVD_TEMPLATE = VBOXR3TSTEXE
  tstVD_SOURCES = tstVD.cpp
@@ -70,7 +70,10 @@
  tstVDSnap_TEMPLATE = VBOXR3TSTEXE
  tstVDSnap_LIBS = $(LIB_DDU)
  tstVDSnap_SOURCES  = tstVDSnap.cpp
+endif
 
+if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG)
+ PROGRAMS += vbox-img
  #
  # vbox-img - static because it migth be used as at standalone tool.
  #