diff --git a/FreeRTOS/Test/CMock/event_groups/event_groups.yml b/FreeRTOS/Test/CMock/event_groups/event_groups.yml
index de9ad9be42..e149b08f25 100644
--- a/FreeRTOS/Test/CMock/event_groups/event_groups.yml
+++ b/FreeRTOS/Test/CMock/event_groups/event_groups.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback
diff --git a/FreeRTOS/Test/CMock/list/list.yml b/FreeRTOS/Test/CMock/list/list.yml
index de9ad9be42..e149b08f25 100644
--- a/FreeRTOS/Test/CMock/list/list.yml
+++ b/FreeRTOS/Test/CMock/list/list.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback
diff --git a/FreeRTOS/Test/CMock/message_buffer/message_buffer.yml b/FreeRTOS/Test/CMock/message_buffer/message_buffer.yml
index de9ad9be42..e149b08f25 100644
--- a/FreeRTOS/Test/CMock/message_buffer/message_buffer.yml
+++ b/FreeRTOS/Test/CMock/message_buffer/message_buffer.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback
diff --git a/FreeRTOS/Test/CMock/queue/queue.yml b/FreeRTOS/Test/CMock/queue/queue.yml
index 1ebd268bf5..c9ba70e6a7 100644
--- a/FreeRTOS/Test/CMock/queue/queue.yml
+++ b/FreeRTOS/Test/CMock/queue/queue.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback
diff --git a/FreeRTOS/Test/CMock/smp/smp.yml b/FreeRTOS/Test/CMock/smp/smp.yml
index 5f50def2f8..d766527c50 100644
--- a/FreeRTOS/Test/CMock/smp/smp.yml
+++ b/FreeRTOS/Test/CMock/smp/smp.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
     - :cexception
diff --git a/FreeRTOS/Test/CMock/stream_buffer/stream_buffer.yml b/FreeRTOS/Test/CMock/stream_buffer/stream_buffer.yml
index de9ad9be42..e149b08f25 100644
--- a/FreeRTOS/Test/CMock/stream_buffer/stream_buffer.yml
+++ b/FreeRTOS/Test/CMock/stream_buffer/stream_buffer.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback
diff --git a/FreeRTOS/Test/CMock/timers/timers.yml b/FreeRTOS/Test/CMock/timers/timers.yml
index de9ad9be42..e149b08f25 100644
--- a/FreeRTOS/Test/CMock/timers/timers.yml
+++ b/FreeRTOS/Test/CMock/timers/timers.yml
@@ -1,13 +1,13 @@
 :cmock:
   :mock_prefix: mock_
   :when_no_prototypes: :warn
+  :when_ptr: :compare_ptr
   :treat_externs: :include
   :enforce_strict_ordering: TRUE
   :plugins:
     - :ignore
     - :ignore_arg
     - :expect_any_args
-    - :array
     - :callback
     - :return_thru_ptr
   :callback_include_count: true # include a count arg when calling the callback