diff --git a/src/mpi/c/test.c b/src/mpi/c/test.c
index 5a62425d5c..9b891458de 100644
--- a/src/mpi/c/test.c
+++ b/src/mpi/c/test.c
@@ -34,18 +34,11 @@ int MPI_Test(MPI_Request *request, int *completed, MPI_Status *status)
         OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
     }
 
-    if(*request == NULL) {
-        *completed = 1;
-        status->MPI_SOURCE = MPI_PROC_NULL;
-        status->MPI_TAG = MPI_ANY_TAG;
-        status->MPI_ERROR = MPI_SUCCESS;
-        status->_count = 0;
-        return MPI_SUCCESS;
-    }
-    rc = ompi_request_test(1, request, &index, completed, status);
+    rc = ompi_request_test(request, completed, status);
     if(*completed < 0) {
         *completed = 0;
     }
+
     /* JMS: Tim will fix to invoke on the communicator/window/file on
        the request (i.e., not COMM_WORLD) */
     OMPI_ERRHANDLER_RETURN(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
diff --git a/src/mpi/c/testany.c b/src/mpi/c/testany.c
index 4c284e751a..82e0b0cbe5 100644
--- a/src/mpi/c/testany.c
+++ b/src/mpi/c/testany.c
@@ -33,7 +33,7 @@ int MPI_Testany(int count, MPI_Request requests[], int *index, int *completed, M
         OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
     }
 
-    rc = ompi_request_test(count, requests, index, completed, status);
+    rc = ompi_request_test_any(count, requests, index, completed, status);
     OMPI_ERRHANDLER_RETURN(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
 }
 
diff --git a/src/mpi/c/testsome.c b/src/mpi/c/testsome.c
index b335e2b9c8..c3f2a285d9 100644
--- a/src/mpi/c/testsome.c
+++ b/src/mpi/c/testsome.c
@@ -36,7 +36,7 @@ int MPI_Testsome(int incount, MPI_Request requests[],
     }
 
     /* optimize this in the future */
-    rc = ompi_request_test(incount, requests, &index, &completed, statuses);
+    rc = ompi_request_test_any(incount, requests, &index, &completed, statuses);
     OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
     if(completed) {
         *outcount = 1;