diff --git a/examples/chip-tool/commands/tests/TestCommand.h b/examples/chip-tool/commands/tests/TestCommand.h
index 3926ea24816486..acaff9a8335859 100644
--- a/examples/chip-tool/commands/tests/TestCommand.h
+++ b/examples/chip-tool/commands/tests/TestCommand.h
@@ -29,7 +29,7 @@
 #include <type_traits>
 #include <zap-generated/tests/CHIPClustersTest.h>
 
-constexpr uint16_t kTimeoutInSeconds = 30;
+constexpr uint16_t kTimeoutInSeconds = 90;
 
 class TestCommand : public CHIPCommand
 {
diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
index 09fd86b52b8b4c..9ea4deaa26aef7 100644
--- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp
+++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -610,6 +610,11 @@ bool emberAfTestClusterClusterTestListInt8UReverseRequestCallback(
     {
         auto iter = commandData.arg1.begin();
         Commands::TestListInt8UReverseResponse::Type responseData;
+        if (count == 0)
+        {
+            SuccessOrExit(commandObj->AddResponseData(commandPath, responseData));
+            return true;
+        }
         size_t cur = count;
         Platform::ScopedMemoryBuffer<uint8_t> responseBuf;
         VerifyOrExit(responseBuf.Calloc(count), );