diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 7946d794b8..40781b9909 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -23,8 +23,6 @@ SOURCES += \
   ../../testing/testingmain.cpp \
   kmz_unarchive_test.cpp \
   navigator_test.cpp \
-# map_foreach_test.cpp \
-# multithread_map_test.cpp \
   bookmarks_test.cpp \
   geourl_test.cpp \
   measurement_tests.cpp \
diff --git a/map/map_tests/multithread_map_test.cpp b/map/mwm_tests/multithread_mwm_test.cpp
similarity index 100%
rename from map/map_tests/multithread_map_test.cpp
rename to map/mwm_tests/multithread_mwm_test.cpp
diff --git a/map/map_tests/map_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp
similarity index 100%
rename from map/map_tests/map_foreach_test.cpp
rename to map/mwm_tests/mwm_foreach_test.cpp
diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro
new file mode 100644
index 0000000000..5b4beb6c16
--- /dev/null
+++ b/map/mwm_tests/mwm_tests.pro
@@ -0,0 +1,25 @@
+# Map library tests.
+
+TARGET = mwm_tests
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+
+ROOT_DIR = ../..
+DEPENDENCIES = map gui search storage graphics indexer platform anim geometry coding base \
+               freetype fribidi expat protobuf tomcrypt jansson zlib
+
+include($$ROOT_DIR/common.pri)
+
+QT *= core opengl
+
+win32* {
+  LIBS *= -lShell32 -lOpengl32
+  win32-g++: LIBS *= -lpthread
+}
+macx*: LIBS *= "-framework Foundation" "-framework IOKit"
+
+SOURCES += \
+  ../../testing/testingmain.cpp \
+  mwm_foreach_test.cpp \
+  multithread_mwm_test.cpp \
diff --git a/omim.pro b/omim.pro
index 87d85e8ab0..4bbc4922b2 100644
--- a/omim.pro
+++ b/omim.pro
@@ -20,7 +20,7 @@ SUBDIRS = 3party \
           gui \
           storage storage/storage_tests \
           search search/search_tests \
-          map map/map_tests map/benchmark_tool \
+          map map/map_tests map/benchmark_tool map/mwm_tests\
           generator generator/generator_tests \
           generator/generator_tool \
           qt_tstfrm \