diff --git a/test/bm_instance_unittest.cpp b/test/bm_instance_unittest.cpp
new file mode 100644
index 0000000..2c603c4
--- /dev/null
+++ b/test/bm_instance_unittest.cpp
@@ -0,0 +1,76 @@
+// Copyright 2024 Google LLC
+//
+// 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.
+
+#include "bm_instance.hpp"
+#include "commands.hpp"
+#include "handler_mock.hpp"
+#include "helper.hpp"
+
+#include <string>
+#include <vector>
+
+#include <gtest/gtest.h>
+
+namespace google
+{
+namespace ipmi
+{
+
+using testing::_;
+using ::testing::Return;
+using ::testing::StrEq;
+
+TEST(GetBMInstancePropertyTest, InvalidRequestSize)
+{
+    std::vector<uint8_t> request = {};
+
+    HandlerMock hMock;
+    EXPECT_EQ(::ipmi::responseReqDataLenInvalid(),
+              getBMInstanceProperty(request, &hMock));
+}
+
+TEST(GetBMInstancePropertyTest, InvalidCommand)
+{
+    std::vector<uint8_t> request = {1};
+    std::string expectedOutput(64, 'a');
+
+    HandlerMock hMock;
+    EXPECT_CALL(hMock, getBMInstanceProperty(1))
+        .WillOnce(Return(expectedOutput));
+    EXPECT_EQ(::ipmi::responseInvalidCommand(),
+              getBMInstanceProperty(request, &hMock));
+}
+
+TEST(GetBMInstancePropertyTest, ValidRequest)
+{
+    std::vector<uint8_t> request = {2};
+    std::string expectedOutput = "asdf";
+
+    HandlerMock hMock;
+    EXPECT_CALL(hMock, getBMInstanceProperty(2))
+        .WillOnce(Return(expectedOutput));
+
+    auto reply = getBMInstanceProperty(request, &hMock);
+    auto result = ValidateReply(reply);
+    auto& data = result.second;
+
+    EXPECT_EQ(sizeof(struct BMInstancePropertyReply) + expectedOutput.size(),
+              data.size());
+    EXPECT_EQ(SysOEMCommands::SysGetBMInstanceProperty, result.first);
+    EXPECT_THAT(std::string(data.begin() + 1, data.end()),
+                StrEq(expectedOutput));
+}
+
+} // namespace ipmi
+} // namespace google
diff --git a/test/handler_mock.hpp b/test/handler_mock.hpp
index 579dfc6..b08cd5e 100644
--- a/test/handler_mock.hpp
+++ b/test/handler_mock.hpp
@@ -71,6 +71,8 @@
                 (const, override));
     MOCK_METHOD(uint16_t, accelGetVrSettings,
                 (::ipmi::Context::ptr, uint8_t, uint8_t), (const, override));
+    MOCK_METHOD(std::string, getBMInstanceProperty, (uint8_t),
+                (const, override));
 };
 
 } // namespace ipmi
diff --git a/test/handler_unittest.cpp b/test/handler_unittest.cpp
index 549f1d0..2fb470e 100644
--- a/test/handler_unittest.cpp
+++ b/test/handler_unittest.cpp
@@ -642,6 +642,18 @@
     }
 }
 
+TEST(HandlerTest, BmInstanceFailCase)
+{
+    StrictMock<sdbusplus::SdBusMock> mock;
+    MockDbusHandler h(mock);
+
+    // Invalid enum
+    EXPECT_THROW(h.getBMInstanceProperty(0x07), IpmiException);
+
+    // Valid enum but no path exists
+    EXPECT_THROW(h.getBMInstanceProperty(0x00), IpmiException);
+}
+
 // TODO: Add checks for other functions of handler.
 
 } // namespace ipmi
diff --git a/test/meson.build b/test/meson.build
index c3387dd..f7e3bb9 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -31,6 +31,7 @@
   'bmc_mode',
   'linux_boot_done',
   'bm_mode_transition',
+  'bm_instance',
 ]
 
 foreach t : tests