diff --git a/apps/Makefile b/apps/Makefile
index 0b1a32f4c..a61605344 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -31,6 +31,7 @@ app_src += $(addprefix apps/,\
   variable_box_empty_controller.cpp \
 )
 
+tests_src += apps/exam_mode_configuration_official.cpp
 apps_official += apps/exam_mode_configuration_official.cpp
 apps_non_official += apps/exam_mode_configuration_non_official.cpp
 
@@ -93,7 +94,7 @@ all_app_src = $(app_src) $(epsilon_src) $(apps_launch_on_boarding_src) $(apps_la
 $(call object_for,$(all_app_src)): $(BUILD_DIR)/apps/i18n.h
 $(call object_for,$(all_app_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
-apps_tests_src = $(app_calculation_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_solver_test_src)
+apps_tests_src = $(app_calculation_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
 
 apps_tests_src += $(addprefix apps/,\
   global_preferences.cpp \
diff --git a/apps/settings/Makefile b/apps/settings/Makefile
index 8b838a549..efe357030 100644
--- a/apps/settings/Makefile
+++ b/apps/settings/Makefile
@@ -1,11 +1,14 @@
 apps += Settings::App
 app_headers += apps/settings/app.h
 
+app_settings_test_src  = $(addprefix apps/settings/,\
+  settings_message_tree.cpp \
+)
+
 app_settings_src = $(addprefix apps/settings/,\
   app.cpp \
   cell_with_separator.cpp \
   main_controller.cpp \
-  settings_message_tree.cpp \
   sub_menu/about_controller.cpp \
   sub_menu/display_mode_controller.cpp \
   sub_menu/exam_mode_controller.cpp \
@@ -15,6 +18,7 @@ app_settings_src = $(addprefix apps/settings/,\
   sub_menu/selectable_view_with_messages.cpp \
 )
 
+app_settings_src += $(app_settings_test_src)
 app_src += $(app_settings_src)
 
 apps_prompt_none_src += apps/settings/main_controller_prompt_none.cpp