diff --git a/trunk/ConsoleDataMigration/sources/tests/OMakefile b/trunk/ConsoleDataMigration/sources/tests/OMakefile
index ead82d1..0cbdd35 100644
--- a/trunk/ConsoleDataMigration/sources/tests/OMakefile
+++ b/trunk/ConsoleDataMigration/sources/tests/OMakefile
@@ -13,30 +13,8 @@
 #
 # $Rev$
 #----------------------------------------------------------------------------
-SUPPORTED_TARGETS   =   CTR-*.Process.MPCore.*
 
-include $(makePlatformDefsPath tests)
+if $(IsTestBuild)
+    .SUBDIRS: $(exist-dirs common)
 
-INCLUDES           +=  \
-                        ../common
-
-TEST_COMMON_SOURCES[] =
-                        ../common/Util.cpp
-
-SOURCES_TEST[]      =   test_Util.cpp
-
-ROMFS_ROOT          =   ../common/romfiles
-
-TEST_ENVIRONMENT_PROCESSLIST = true
-TEST_ENVIRONMENT_EMUMEM = true
-
-LIBS                +=  libnn_test
-
-ROM_SPEC_FILE       =   ../ConsoleRestore/ConsoleRestore.rsf
-DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
-
-
-include $(makePlatformDefsPath build.tests)
-
-
-tests: $(TEST_TARGETS)
+DefineDefaultRules()
diff --git a/trunk/ConsoleDataMigration/sources/tests/common/OMakefile b/trunk/ConsoleDataMigration/sources/tests/common/OMakefile
new file mode 100644
index 0000000..616f7c7
--- /dev/null
+++ b/trunk/ConsoleDataMigration/sources/tests/common/OMakefile
@@ -0,0 +1,20 @@
+#!/usr/bin/env omake
+#----------------------------------------------------------------------------
+# Project:  Horizon
+# File:     OMakefile
+#
+# Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Rev$
+#----------------------------------------------------------------------------
+
+if $(IsTestBuild)
+    .SUBDIRS: $(exist-dirs util)
+
+DefineDefaultRules()
diff --git a/trunk/ConsoleDataMigration/sources/tests/common/util/OMakefile b/trunk/ConsoleDataMigration/sources/tests/common/util/OMakefile
new file mode 100644
index 0000000..825ae74
--- /dev/null
+++ b/trunk/ConsoleDataMigration/sources/tests/common/util/OMakefile
@@ -0,0 +1,55 @@
+#!/usr/bin/env omake
+#----------------------------------------------------------------------------
+# Project:  Horizon
+# File:     OMakefile
+#
+# Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Rev$
+#----------------------------------------------------------------------------
+SUPPORTED_TARGETS   =   CTR-*.Process.MPCore.*
+
+include $(makePlatformDefsPath tests)
+
+SAMPLED_DEMOS_COMMON_INCLUDE_DIR   = $(dir $(HORIZON_ROOT)/../CTR/SampleDemos/common/include)
+INCLUDES           +=   $(SAMPLED_DEMOS_COMMON_INCLUDE_DIR) \
+                        ../../../common \
+
+
+
+TEST_COMMON_SOURCES[] =
+                        ../../../common/Util.cpp
+                        ../../../common/HeapManager.cpp
+                        ../../../common/SdLogger.cpp
+                        ../../../common/LogConsole.cpp
+                        ../../../common/CommonLogger.cpp
+                        ../../../common/SdMountManager.cpp
+                        ../../../common/VersionDetect.cpp
+
+
+SOURCES_TEST[]      =   test_Util.cpp
+
+ROMFS_ROOT          =   ../../../common/romfiles
+
+TEST_ENVIRONMENT_PROCESSLIST = true
+TEST_ENVIRONMENT_EMUMEM = true
+
+LIBS                +=  libnn_test \
+                        libnn_mcu  \
+                        libnn_ps \
+
+
+ROM_SPEC_FILE       =   ../../../ConsoleRestore/ConsoleRestore.rsf
+DESCRIPTOR          =   $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool.desc
+
+
+include $(makePlatformDefsPath build.tests)
+
+
+tests: $(TEST_TARGETS)
diff --git a/trunk/ConsoleDataMigration/sources/tests/test_Util.cpp b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
similarity index 100%
rename from trunk/ConsoleDataMigration/sources/tests/test_Util.cpp
rename to trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp