diff --git a/scripts/functional_tests/driver.sh b/scripts/functional_tests/driver.sh
index 5adb033166..556681ec66 100755
--- a/scripts/functional_tests/driver.sh
+++ b/scripts/functional_tests/driver.sh
@@ -55,6 +55,30 @@ case $2 in
         echo "putnbi_n2_w1_z1_1MB"
         ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 1 -s 1048576 -a 3 > $3/putnbi_n2_w1_z1_1MB.log
         check putnbi_n2_w1_z1_1MB
+        echo "wg_get_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 28 > $3/wg_get_n2_w1_z1_1MB.log
+        check wg_get_n2_w1_z1_1MB
+        echo "wg_getnbi_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 29 > $3/wg_getnbi_n2_w1_z1_1MB.log
+        check wg_getnbi_n2_w1_z1_1MB
+        echo "wg_put_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 30 > $3/wg_put_n2_w1_z1_1MB.log
+        check wg_put_n2_w1_z1_1MB
+        echo "wg_putnbi_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 31 > $3/wg_putnbi_n2_w1_z1_1MB.log
+        check wg_putnbi_n2_w1_z1_1MB
+        echo "wave_get_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 32 > $3/wave_get_n2_w1_z1_1MB.log
+        check wave_get_n2_w1_z1_1MB
+        echo "wave_getnbi_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 33 > $3/wave_getnbi_n2_w1_z1_1MB.log
+        check wave_getnbi_n2_w1_z1_1MB
+        echo "wave_put_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 34 > $3/wave_put_n2_w1_z1_1MB.log
+        check wave_put_n2_w1_z1_1MB
+        echo "wave_putnbi_n2_w1_z1_1MB"
+        ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 64 -s 1048576 -a 35 > $3/wave_putnbi_n2_w1_z1_1MB.log
+        check wave_putnbi_n2_w1_z1_1MB
         echo "amofadd_n2_w1_z1"
         ROC_SHMEM_MAX_NUM_CONTEXTS=1 mpirun -np 2 $1 -w 1 -z 1 -a 6 > $3/amofadd_n2_w1_z1.log
         check amofadd_n2_w1_z1
diff --git a/tests/functional_tests/CMakeLists.txt b/tests/functional_tests/CMakeLists.txt
index a6176e402e..542462261d 100644
--- a/tests/functional_tests/CMakeLists.txt
+++ b/tests/functional_tests/CMakeLists.txt
@@ -55,6 +55,7 @@ target_sources(
     shmem_ptr_tester.cpp
     extended_primitives.cpp
     empty_tester.cpp
+    wave_level_primitives.cpp
 )
 
 ###############################################################################
diff --git a/tests/functional_tests/tester.cpp b/tests/functional_tests/tester.cpp
index f35928eb53..58d40cb4f2 100644
--- a/tests/functional_tests/tester.cpp
+++ b/tests/functional_tests/tester.cpp
@@ -52,6 +52,7 @@
 #include "team_ctx_infra_tester.hpp"
 #include "team_ctx_primitive_tester.hpp"
 #include "team_reduction_tester.hpp"
+#include "wave_level_primitives.hpp"
 
 Tester::Tester(TesterArguments args) : args(args) {
   _type = (TestType)args.algorithm;
@@ -488,6 +489,22 @@ std::vector<Tester*> Tester::create(TesterArguments args) {
         std::cout << "Non-Blocking Put message rate***" << std::endl;
       testers.push_back(new PrimitiveMRTester(args));
       return testers;
+    case WAVEGetTestType:
+      if (rank == 0) std::cout << "WAVE Blocking Gets***" << std::endl;
+      testers.push_back(new WaveLevelPrimitiveTester(args));
+      return testers;
+    case WAVEGetNBITestType:
+      if (rank == 0) std::cout << "WAVE Non-Blocking Gets***" << std::endl;
+      testers.push_back(new WaveLevelPrimitiveTester(args));
+      return testers;
+    case WAVEPutTestType:
+      if (rank == 0) std::cout << "WAVE Blocking Puts***" << std::endl;
+      testers.push_back(new WaveLevelPrimitiveTester(args));
+      return testers;
+    case WAVEPutNBITestType:
+      if (rank == 0) std::cout << "WAVE Non-Blocking Puts***" << std::endl;
+      testers.push_back(new WaveLevelPrimitiveTester(args));
+      return testers;
     default:
       if (rank == 0) std::cout << "Unknown***" << std::endl;
       testers.push_back(new PrimitiveTester(args));
diff --git a/tests/functional_tests/wave_level_primitives.cpp b/tests/functional_tests/wave_level_primitives.cpp
new file mode 100644
index 0000000000..6cb2ee8a80
--- /dev/null
+++ b/tests/functional_tests/wave_level_primitives.cpp
@@ -0,0 +1,118 @@
+/******************************************************************************
+ * 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 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 "wave_level_primitives.hpp"
+
+#include <roc_shmem/roc_shmem.hpp>
+
+using namespace rocshmem;
+
+/******************************************************************************
+ * DEVICE TEST KERNEL
+ *****************************************************************************/
+__global__ void WaveLevelPrimitiveTest(int loop, int skip, uint64_t *timer,
+                                      char *s_buf, char *r_buf, int size,
+                                      TestType type,
+                                      ShmemContextType ctx_type) {
+  __shared__ roc_shmem_ctx_t ctx;
+  roc_shmem_wg_init();
+  roc_shmem_wg_ctx_create(ctx_type, &ctx);
+
+  uint64_t start;
+
+  for (int i = 0; i < loop + skip; i++) {
+    if (i == skip) start = roc_shmem_timer();
+
+    switch (type) {
+      case WAVEGetTestType:
+        roc_shmemx_ctx_getmem_wave(ctx, r_buf, s_buf, size, 1);
+        break;
+      case WAVEGetNBITestType:
+        roc_shmemx_ctx_getmem_nbi_wave(ctx, r_buf, s_buf, size, 1);
+        break;
+      case WAVEPutTestType:
+        roc_shmemx_ctx_putmem_wave(ctx, r_buf, s_buf, size, 1);
+        break;
+      case WAVEPutNBITestType:
+        roc_shmemx_ctx_putmem_nbi_wave(ctx, r_buf, s_buf, size, 1);
+        break;
+      default:
+        break;
+    }
+  }
+
+  roc_shmem_ctx_quiet(ctx);
+
+  if (hipThreadIdx_x == 0) {
+    timer[hipBlockIdx_x] = roc_shmem_timer() - start;
+  }
+
+  roc_shmem_wg_ctx_destroy(&ctx);
+  roc_shmem_wg_finalize();
+}
+
+/******************************************************************************
+ * HOST TESTER CLASS METHODS
+ *****************************************************************************/
+WaveLevelPrimitiveTester::WaveLevelPrimitiveTester(TesterArguments args)
+    : Tester(args) {
+  s_buf = (char *)roc_shmem_malloc(args.max_msg_size * args.wg_size);
+  r_buf = (char *)roc_shmem_malloc(args.max_msg_size * args.wg_size);
+}
+
+WaveLevelPrimitiveTester::~WaveLevelPrimitiveTester() {
+  roc_shmem_free(s_buf);
+  roc_shmem_free(r_buf);
+}
+
+void WaveLevelPrimitiveTester::resetBuffers(uint64_t size) {
+  memset(s_buf, '0', args.max_msg_size * args.wg_size);
+  memset(r_buf, '1', args.max_msg_size * args.wg_size);
+}
+
+void WaveLevelPrimitiveTester::launchKernel(dim3 gridSize, dim3 blockSize,
+                                           int loop, uint64_t size) {
+  size_t shared_bytes = 0;
+
+  hipLaunchKernelGGL(WaveLevelPrimitiveTest, gridSize, blockSize, shared_bytes,
+                     stream, loop, args.skip, timer, s_buf, r_buf, size, _type,
+                     _shmem_context);
+
+  num_msgs = (loop + args.skip) * gridSize.x;
+  num_timed_msgs = loop;
+}
+
+void WaveLevelPrimitiveTester::verifyResults(uint64_t size) {
+  int check_id = (_type == WAVEGetTestType || _type == WAVEGetNBITestType)
+                     ? 0
+                     : 1;
+
+  if (args.myid == check_id) {
+    for (int i = 0; i < size; i++) {
+      if (r_buf[i] != '0') {
+        fprintf(stderr, "Data validation error at idx %d\n", i);
+        fprintf(stderr, "Got %c, Expected %c \n", r_buf[i], '0');
+        exit(-1);
+      }
+    }
+  }
+}
diff --git a/tests/functional_tests/wave_level_primitives.hpp b/tests/functional_tests/wave_level_primitives.hpp
new file mode 100644
index 0000000000..8c59d81350
--- /dev/null
+++ b/tests/functional_tests/wave_level_primitives.hpp
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * 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 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.
+ *****************************************************************************/
+
+#ifndef _WAVE_LEVEL_PRIMITIVE_TEST_HPP_
+#define _WAVE_LEVEL_PRIMITIVE_TEST_HPP_
+
+#include "tester.hpp"
+
+/******************************************************************************
+ * HOST TESTER CLASS
+ *****************************************************************************/
+class WaveLevelPrimitiveTester : public Tester {
+ public:
+  explicit WaveLevelPrimitiveTester(TesterArguments args);
+  virtual ~WaveLevelPrimitiveTester();
+
+ protected:
+  virtual void resetBuffers(uint64_t size) override;
+
+  virtual void launchKernel(dim3 gridSize, dim3 blockSize, int loop,
+                            uint64_t size) override;
+
+  virtual void verifyResults(uint64_t size) override;
+
+  char *s_buf = nullptr;
+  char *r_buf = nullptr;
+};
+
+#endif