diff --git a/src/app/data-model/BasicTypes.h b/src/app/data-model/BasicTypes.h
index 6bc1c967d18423..4011d7b2180e0c 100644
--- a/src/app/data-model/BasicTypes.h
+++ b/src/app/data-model/BasicTypes.h
@@ -56,12 +56,24 @@ struct IsBasicType<ByteSpan>
     static constexpr bool value = true;
 };
 
+template <>
+struct IsBasicType<MutableByteSpan>
+{
+    static constexpr bool value = true;
+};
+
 template <>
 struct IsBasicType<CharSpan>
 {
     static constexpr bool value = true;
 };
 
+template <>
+struct IsBasicType<MutableCharSpan>
+{
+    static constexpr bool value = true;
+};
+
 } // namespace DataModel
 } // namespace app
 } // namespace chip
diff --git a/src/app/tests/suites/certification/Test_TC_FAN_2_5.yaml b/src/app/tests/suites/certification/Test_TC_FAN_2_5.yaml
new file mode 100644
index 00000000000000..60bc1d3285669d
--- /dev/null
+++ b/src/app/tests/suites/certification/Test_TC_FAN_2_5.yaml
@@ -0,0 +1,41 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: 263.2.5. [TC-FAN-2.5] Optional direction attributes with DUT as Server
+
+PICS:
+    - FAN.S
+    - FAN.S.F05
+
+config:
+    nodeId: 0x12344321
+    cluster: "Fan Control"
+    endpoint: 1
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH reads from the DUT the the AirflowDirection attribute"
+      PICS: FAN.S.F05
+      command: "readAttribute"
+      attribute: "AirflowDirection"
+      response:
+          constraints:
+              type: AirflowDirectionEnum