diff --git a/test/mock_syscall.hpp b/test/mock_syscall.hpp
index 39c3986..4b0cb20 100644
--- a/test/mock_syscall.hpp
+++ b/test/mock_syscall.hpp
@@ -1,19 +1,11 @@
 #pragma once
-#include <net/ethernet.h>
+#include "system_queries.hpp"
 
-#include <optional>
-#include <string>
-
-/** @brief Clears out the interfaces and IPs configured for mocking
- */
+namespace phosphor::network::system
+{
+/** @brief Clears out the interfaces and IPs configured for mocking */
 void mock_clear();
 
-/** @brief Adds an address string to index mapping and MAC mapping
- *
- *  @param[in] name - Interface name
- *  @param[in] idx  - Interface index
- *  @param[in] mac  - Interface MAC address
- */
-void mock_addIF(const std::string& name, unsigned idx, unsigned flags = 0,
-                std::optional<ether_addr> mac = std::nullopt,
-                std::optional<unsigned> mtu = std::nullopt);
+/** @brief Adds an interface definition to the mock system */
+void mock_addIF(const InterfaceInfo& info);
+} // namespace phosphor::network::system