diff --git a/tests/Gia64-test-rbs.c b/tests/Gia64-test-rbs.c
index f84dbeaf..ba89f881 100644
--- a/tests/Gia64-test-rbs.c
+++ b/tests/Gia64-test-rbs.c
@@ -38,7 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #define panic(args...)							  \
 	do { fprintf (stderr, args); ++nerrors; return -9999; } while (0)
 
-#define NELEMS(a)	((int) (sizeof (a) / sizeof ((a)[0])))
+#define ARRAY_SIZE(a)	((int) (sizeof (a) / sizeof ((a)[0])))
 
 /* The loadrs field in ar.rsc is 14 bits wide, which limits all ia64
    implementations to at most 2048 physical stacked registers
@@ -138,7 +138,7 @@ run_check (int test)
 
   /* First, generate a set of 88 random values which loadup() will load
      into loc2-loc89 (r37-r124).  */
-  for (i = 0; i < NELEMS (reg_values); ++i)
+  for (i = 0; i < ARRAY_SIZE (reg_values); ++i)
     {
       reg_values[i] = random ();
       /* Generate NaTs with a reasonably probability (1/16th): */
@@ -150,7 +150,7 @@ run_check (int test)
   nfuncs = 0;
   do
     {
-      n = random () % NELEMS (spill_funcs);
+      n = random () % ARRAY_SIZE (spill_funcs);
       func[nfuncs++] = spill_funcs[n];
       nspills += 2 + n;
     }