diff --git a/projects/rccl-tests/src/alltoallv.cu b/projects/rccl-tests/src/alltoallv.cu
index 7a39bcce7b..cb8fcaff0d 100644
--- a/projects/rccl-tests/src/alltoallv.cu
+++ b/projects/rccl-tests/src/alltoallv.cu
@@ -71,12 +71,12 @@ testResult_t AlltoAllvInitData(struct threadArgs* args, ncclDataType_t type, ncc
       size_t chunksize = data_count/nranks;
       for (int j=0; j<nranks; j++) {
 	size_t scount = 0, rcount = ((j+rank)%nranks)*chunksize;
-	if (j+rank == nranks-1)
+	if ((j+rank)%nranks == 0)
           rcount += (sendcount-chunksize*(nranks-1)*nranks/2);
 	size_t sdisp = 0;
 	for (int k=0; k<nranks; k++) {
 	  scount = ((k+j)%nranks)*chunksize;
-	  if (k+j == nranks-1)
+	  if ((k+j)%nranks == 0)
 	    scount += (sendcount-chunksize*(nranks-1)*nranks/2);
 	  if (k == rank)
 	    break;
@@ -119,7 +119,7 @@ testResult_t AlltoAllvRunColl(void* sendbuff, void* recvbuff, size_t count, nccl
   size_t chunksize = count*2/nranks;
   for (int i = 0; i < nranks; i++) {
       size_t scount = ((i+rank)%nranks)*chunksize;
-      if (i+rank == nranks-1)
+      if ((i+rank)%nranks == 0)
           scount += (count*nranks-chunksize*(nranks-1)*nranks/2);
       sendcounts[i+rank*MAX_ALLTOALLV_RANKS] = recvcounts[i+rank*MAX_ALLTOALLV_RANKS] = scount;
       sdispls[i+rank*MAX_ALLTOALLV_RANKS] = rdispls[i+rank*MAX_ALLTOALLV_RANKS] = disp;