diff --git a/userspace/bin/CMakeLists.txt b/userspace/bin/CMakeLists.txt
index 363588620..2a45ad493 100644
--- a/userspace/bin/CMakeLists.txt
+++ b/userspace/bin/CMakeLists.txt
@@ -83,7 +83,11 @@ foreach(FILE_NAME ${PROGRAM_LIST})
     set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${MENTOS_BIN_DIR}")
     # Set the output name.
     set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}")
-
+    # Make sure the bin folder exists.
+    add_custom_command(
+        TARGET ${TARGET_NAME} PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MENTOS_BIN_DIR}
+    )
     # Append the program name to the list of all the executables.
     list(APPEND ALL_EXECUTABLES ${TARGET_NAME})
 endforeach()
diff --git a/userspace/tests/CMakeLists.txt b/userspace/tests/CMakeLists.txt
index 70c76d35c..598cc704a 100644
--- a/userspace/tests/CMakeLists.txt
+++ b/userspace/tests/CMakeLists.txt
@@ -96,6 +96,11 @@ foreach(FILE_NAME ${TEST_LIST})
     set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${MENTOS_TESTS_DIR}")
     # Set the output name.
     set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}")
+    # Make sure the tests folder exists.
+    add_custom_command(
+        TARGET ${TARGET_NAME} PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${MENTOS_TESTS_DIR}
+    )
 
     # Append the program name to the list of all the executables.
     list(APPEND ALL_EXECUTABLES ${TARGET_NAME})