diff --git a/catch/unit/gl_interop/CMakeLists.txt b/catch/unit/gl_interop/CMakeLists.txt
index 729926dde9..8faa7e9c2d 100644
--- a/catch/unit/gl_interop/CMakeLists.txt
+++ b/catch/unit/gl_interop/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(TEST_SRC
     hipGLGetDevices.cc
+    hipGraphicsGLRegisterBuffer.cc
 )
 
 hip_add_exe_to_target(NAME GLInteropTest
diff --git a/catch/unit/gl_interop/hipGraphicsGLRegisterBuffer.cc b/catch/unit/gl_interop/hipGraphicsGLRegisterBuffer.cc
new file mode 100644
index 0000000000..43e572b95b
--- /dev/null
+++ b/catch/unit/gl_interop/hipGraphicsGLRegisterBuffer.cc
@@ -0,0 +1,97 @@
+/*
+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"
+
+namespace {
+constexpr std::array<unsigned int, 3> kFlags{hipGraphicsRegisterFlagsNone,
+                                             hipGraphicsRegisterFlagsReadOnly,
+                                             hipGraphicsRegisterFlagsWriteDiscard};
+}  // anonymous namespace
+
+TEST_CASE("Unit_hipGraphicsGLRegisterBuffer_Positive_Basic") {
+  GLContextScopeGuard gl_context;
+
+  const auto flags = GENERATE(from_range(begin(kFlags), end(kFlags)));
+
+  GLBufferObject vbo;
+
+  hipGraphicsResource* vbo_resource;
+
+  HIP_CHECK(hipGraphicsGLRegisterBuffer(&vbo_resource, vbo, flags));
+
+  HIP_CHECK(hipGraphicsUnregisterResource(vbo_resource));
+}
+
+TEST_CASE("Unit_hipGraphicsGLRegisterBuffer_Positive_Register_Twice") {
+  GLContextScopeGuard gl_context;
+
+  GLBufferObject vbo;
+
+  hipGraphicsResource *vbo_resource_1, *vbo_resource_2;
+
+  HIP_CHECK(hipGraphicsGLRegisterBuffer(&vbo_resource_1, vbo, hipGraphicsRegisterFlagsNone));
+  HIP_CHECK(hipGraphicsGLRegisterBuffer(&vbo_resource_2, vbo, hipGraphicsRegisterFlagsNone));
+
+  HIP_CHECK(hipGraphicsUnregisterResource(vbo_resource_1));
+  HIP_CHECK(hipGraphicsUnregisterResource(vbo_resource_2));
+}
+
+TEST_CASE("Unit_hipGraphicsGLRegisterBuffer_Negative_Parameters") {
+  GLContextScopeGuard gl_context;
+
+  GLBufferObject vbo;
+
+  hipGraphicsResource* vbo_resource;
+
+  SECTION("resource == nullptr") {
+    HIP_CHECK_ERROR(hipGraphicsGLRegisterBuffer(nullptr, vbo, hipGraphicsRegisterFlagsNone),
+                    hipErrorInvalidValue);
+  }
+
+  SECTION("invalid buffer") {
+    HIP_CHECK_ERROR(
+        hipGraphicsGLRegisterBuffer(&vbo_resource, GLuint{}, hipGraphicsRegisterFlagsNone),
+        hipErrorInvalidValue);
+  }
+
+  SECTION("invalid flags") {
+    HIP_CHECK_ERROR(
+        hipGraphicsGLRegisterBuffer(&vbo_resource, vbo, std::numeric_limits<unsigned int>::max()),
+        hipErrorInvalidValue);
+  }
+
+  SECTION("flags == hipGraphicsRegisterFlagsSurfaceLoadStore") {
+    HIP_CHECK_ERROR(
+        hipGraphicsGLRegisterBuffer(&vbo_resource, vbo, hipGraphicsRegisterFlagsSurfaceLoadStore),
+        hipErrorInvalidValue);
+  }
+
+  SECTION("flags == hipGraphicsRegisterFlagsTextureGather") {
+    HIP_CHECK_ERROR(
+        hipGraphicsGLRegisterBuffer(&vbo_resource, vbo, hipGraphicsRegisterFlagsTextureGather),
+        hipErrorInvalidValue);
+  }
+}
\ No newline at end of file