diff --git a/test/shmemx/c11_test_shmem_ibget.c b/test/shmemx/c11_test_shmem_ibget.c
index e0cec5a..a2cd772 100644
--- a/test/shmemx/c11_test_shmem_ibget.c
+++ b/test/shmemx/c11_test_shmem_ibget.c
@@ -63,7 +63,7 @@
   } while (0)
 
 #else
-#define TEST_SHMEM_GET(USE_CTX, TYPE)
+#define TEST_SHMEM_IBGET(USE_CTX, TYPE)
 
 #endif
 
diff --git a/test/shmemx/c11_test_shmem_ibput.c b/test/shmemx/c11_test_shmem_ibput.c
index 0c74f23..7d5713b 100644
--- a/test/shmemx/c11_test_shmem_ibput.c
+++ b/test/shmemx/c11_test_shmem_ibput.c
@@ -63,7 +63,7 @@
   } while (0)
 
 #else
-#define TEST_SHMEM_PUT(USE_CTX, TYPE)
+#define TEST_SHMEM_IBPUT(USE_CTX, TYPE)
 
 #endif
 
diff --git a/test/shmemx/cxx_test_shmem_ibget.cpp b/test/shmemx/cxx_test_shmem_ibget.cpp
index 258d965..5e45a3a 100644
--- a/test/shmemx/cxx_test_shmem_ibget.cpp
+++ b/test/shmemx/cxx_test_shmem_ibget.cpp
@@ -32,7 +32,6 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <shmem.h>
 #include <shmemx.h>
@@ -49,11 +48,11 @@
                                                                 \
     if (USE_CTX)                                                \
       shmemx_ctx_##TYPENAME##_ibget(SHMEM_CTX_DEFAULT, local,   \
-                            remote, 1, 1, 1, 10,                \
-                            (mype + 1) % npes);                 \
+                                    remote, 1, 1, 1, 10,        \
+                                    (mype + 1) % npes);         \
     else                                                        \
       shmemx_##TYPENAME##_ibget(local, remote, 1, 1, 1, 10,     \
-                                    (mype + 1) % npes);         \
+                                (mype + 1) % npes);             \
                                                                 \
     for (int i = 0; i < 10; i++)                                \
       if (local[i] != (TYPE)((mype + 1) % npes)) {              \
diff --git a/test/shmemx/cxx_test_shmem_ibput.cpp b/test/shmemx/cxx_test_shmem_ibput.cpp
index cde9eb1..9a077f1 100644
--- a/test/shmemx/cxx_test_shmem_ibput.cpp
+++ b/test/shmemx/cxx_test_shmem_ibput.cpp
@@ -32,7 +32,6 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <shmem.h>
 #include <shmemx.h>
@@ -48,11 +47,11 @@
                                                                 \
     if (USE_CTX)                                                \
       shmemx_ctx_##TYPENAME##_ibput(SHMEM_CTX_DEFAULT, remote,  \
-                              local, 1, 1, 1, 10,               \
-                              (mype + 1) % npes);               \
+                                    local, 1, 1, 1, 10,         \
+                                    (mype + 1) % npes);         \
     else                                                        \
       shmemx_##TYPENAME##_ibput(remote, local, 1, 1, 1, 10,     \
-                                    (mype + 1) % npes);         \
+                                (mype + 1) % npes);             \
                                                                 \
     shmem_barrier_all();                                        \
     for (int i = 0; i < 10; i++)                                \