diff --git a/projects/hip-tests/catch/unit/kernel/CMakeLists.txt b/projects/hip-tests/catch/unit/kernel/CMakeLists.txt
index a32d48f4f2..54805bc602 100644
--- a/projects/hip-tests/catch/unit/kernel/CMakeLists.txt
+++ b/projects/hip-tests/catch/unit/kernel/CMakeLists.txt
@@ -33,6 +33,7 @@ set(TEST_SRC
     hipTestGlobalVariable.cc
     hipTestMemKernel.cc
     launch_bounds.cc
+    hipAutoThreadIdx.cc
 )
 if(UNIX)
   set(TEST_SRC ${TEST_SRC}
diff --git a/projects/hip-tests/catch/unit/kernel/hipAutoThreadIdx.cc b/projects/hip-tests/catch/unit/kernel/hipAutoThreadIdx.cc
new file mode 100644
index 0000000000..b843431a88
--- /dev/null
+++ b/projects/hip-tests/catch/unit/kernel/hipAutoThreadIdx.cc
@@ -0,0 +1,77 @@
+/*
+Copyright (c) 2024 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 WARRANNTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNNESS 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 INN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+#include <hip_test_common.hh>
+
+/**
+* @addtogroup hipLaunchKernelGGL
+* @{
+* @ingroup KernelTest
+* `void hipLaunchKernelGGL(F kernel, const dim3& numBlocks, const dim3& dimBlocks,
+   std::uint32_t sharedMemBytes, hipStream_t stream, Args... args)` -
+* Method to invocate kernel functions
+*/
+
+static __global__ void vecSqrSingBlk(int* A_d, size_t NELEM) {
+  if (0 == blockIdx.x) {
+    for (auto i = threadIdx.x; i < NELEM; i += blockDim.x) {
+      A_d[i] = A_d[i] * A_d[i];
+    }
+  }
+}
+
+/**
+ * Test Description
+ * ------------------------
+ * - Test case to check usage of C++11 auto for kernel variables.
+ * Test source
+ * ------------------------
+ * - catch/unit/kernel/hipAutoThreadIdx.cc
+ * Test requirements
+ * ------------------------
+ * - HIP_VERSION >= 6.1
+ */
+TEST_CASE("Unit_kernel_Assign_threadIdx_to_auto") {
+  int *A_d;
+  const unsigned blocks = 256;
+  const unsigned threadsPerBlock = 128;
+  size_t N = (blocks * threadsPerBlock);
+  std::vector<int> A_h(N), C_h(N);
+  size_t Nbytes = N * sizeof(float);
+
+  // Fill with data
+  for (size_t i = 0; i < N; i++) {
+    A_h[i] = i;
+  }
+
+  // Transfer data and perform operations on GPU
+  HIP_CHECK(hipMalloc(&A_d, Nbytes));
+  HIP_CHECK(hipMemcpy(A_d, A_h.data(), Nbytes, hipMemcpyHostToDevice));
+  hipLaunchKernelGGL(vecSqrSingBlk, dim3(blocks), dim3(threadsPerBlock),
+                    0, 0, A_d, N);
+  HIP_CHECK(hipMemcpy(C_h.data(), A_d, Nbytes, hipMemcpyDeviceToHost));
+  HIP_CHECK(hipDeviceSynchronize());
+  for (size_t i = 0; i < N; i++) {
+    REQUIRE(C_h[i] == (i*i));
+  }
+  HIP_CHECK(hipFree(A_d));
+}