diff --git a/FreeRTOS/Test/CMock/Makefile b/FreeRTOS/Test/CMock/Makefile
index 177a974a37..fe942bc3b5 100644
--- a/FreeRTOS/Test/CMock/Makefile
+++ b/FreeRTOS/Test/CMock/Makefile
@@ -7,11 +7,11 @@ export CC ?= /usr/local/bin/gcc
 export LD ?= /usr/local/bin/ld
 
 # Add units here when adding a new unit test directory with the same name
-#UNITS       +=  list
+UNITS       +=  list
 #UNITS       +=  queue
 #UNITS       +=  timers
-#UNITS       +=  stream_buffer
-#UNITS       +=  message_buffer
+UNITS       +=  stream_buffer
+UNITS       +=  message_buffer
 UNITS       +=  event_groups
 
 COVINFO     :=  $(BUILD_DIR)/cmock_test.info