diff --git a/catch/unit/gl_interop/CMakeLists.txt b/catch/unit/gl_interop/CMakeLists.txt
index 5dae1160f..a54485e3d 100644
--- a/catch/unit/gl_interop/CMakeLists.txt
+++ b/catch/unit/gl_interop/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TEST_SRC
     hipGLGetDevices.cc
     hipGraphicsGLRegisterBuffer.cc
     hipGraphicsGLRegisterImage.cc
+    hipGraphicsMapResources.cc
 )
 
 hip_add_exe_to_target(NAME GLInteropTest
diff --git a/catch/unit/gl_interop/hipGraphicsMapResources.cc b/catch/unit/gl_interop/hipGraphicsMapResources.cc
new file mode 100644
index 000000000..2056265bf
--- /dev/null
+++ b/catch/unit/gl_interop/hipGraphicsMapResources.cc
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <hip_test_common.hh>
+#include <hip/hip_runtime_api.h>
+
+#include "gl_interop_common.hh"
+
+TEST_CASE("Unit_hipGraphicsMapResources_Positive_Basic") {
+  GLContextScopeGuard gl_context;
+
+  GLBufferObject vbo;
+  GLImageObject tex;
+
+  std::array<hipGraphicsResource_t, 2> resources;
+
+  HIP_CHECK(hipGraphicsGLRegisterBuffer(&resources.at(0), vbo, hipGraphicsRegisterFlagsNone));
+  HIP_CHECK(hipGraphicsGLRegisterImage(&resources.at(1), tex, GL_TEXTURE_2D,
+                                       hipGraphicsRegisterFlagsNone));
+
+  hipStream_t stream;
+  HIP_CHECK(hipStreamCreate(&stream));
+
+  HIP_CHECK(hipGraphicsMapResources(resources.size(), resources.data(), stream));
+
+  HIP_CHECK(hipGraphicsUnmapResources(resources.size(), resources.data(), stream));
+
+  HIP_CHECK(hipStreamDestroy(stream));
+
+  HIP_CHECK(hipGraphicsUnregisterResource(resources.at(0)));
+  HIP_CHECK(hipGraphicsUnregisterResource(resources.at(1)));
+}
+
+TEST_CASE("Unit_hipGraphicsMapResources_Negative_Parameters") {
+  GLContextScopeGuard gl_context;
+
+  GLBufferObject vbo;
+
+  hipGraphicsResource* vbo_resource;
+
+  HIP_CHECK(hipGraphicsGLRegisterBuffer(&vbo_resource, vbo, hipGraphicsRegisterFlagsNone));
+
+  SECTION("count == 0") {
+    HIP_CHECK_ERROR(hipGraphicsMapResources(0, &vbo_resource, 0), hipErrorInvalidValue);
+  }
+
+  SECTION("resources == nullptr") {
+    HIP_CHECK_ERROR(hipGraphicsMapResources(1, nullptr, 0), hipErrorInvalidValue);
+  }
+
+  SECTION("unregistered resource") {
+    hipGraphicsResource* unregistered_resource;
+    HIP_CHECK(
+        hipGraphicsGLRegisterBuffer(&unregistered_resource, vbo, hipGraphicsRegisterFlagsNone));
+    HIP_CHECK(hipGraphicsUnregisterResource(unregistered_resource));
+    HIP_CHECK_ERROR(hipGraphicsMapResources(1, &unregistered_resource, 0), hipErrorInvalidHandle);
+  }
+
+  SECTION("already mapped resource") {
+    HIP_CHECK(hipGraphicsMapResources(1, &vbo_resource, 0));
+    HIP_CHECK_ERROR(hipGraphicsMapResources(1, &vbo_resource, 0), hipErrorAlreadyMapped);
+    HIP_CHECK(hipGraphicsUnmapResources(1, &vbo_resource, 0));
+  }
+
+  SECTION("invalid stream") {
+    hipStream_t stream;
+    HIP_CHECK(hipStreamCreate(&stream));
+    HIP_CHECK(hipStreamDestroy(stream));
+    HIP_CHECK_ERROR(hipGraphicsMapResources(1, &vbo_resource, stream), hipErrorContextIsDestroyed);
+  }
+
+  HIP_CHECK(hipGraphicsUnregisterResource(vbo_resource));
+}
\ No newline at end of file