diff --git a/Utilities/test_mpi/makefile b/Utilities/test_mpi/makefile
index 02694e4b8c2..e3d4cff25d5 100644
--- a/Utilities/test_mpi/makefile
+++ b/Utilities/test_mpi/makefile
@@ -41,8 +41,8 @@ setup_win:
 
 impi_intel_win: SHELL=C:/Windows/System32/cmd.exe
 impi_intel_win: MPILIB = "$(I_MPI_RELEASE_ROOT)\impi.lib"
-impi_intel_win: MPIINCLUDE = "$(I_MPI_ROOT)\intel64\include"
-impi_intel_win: FFLAGS = /Qipo /O2 /I$(MPIINCLUDE)
+impi_intel_win: MPIINCLUDE = "$(IMPI_INCLUDE)"
+impi_intel_win: FFLAGS = /Qipo /O2 /I$(MPIINCLUDE) -fc=ifx
 impi_intel_win: FCOMPL = mpiifort
 impi_intel_win: obj = test_mpi
 impi_intel_win: setup_win $(objwin_mpi)
diff --git a/Utilities/test_mpi/test_mpi.f90 b/Utilities/test_mpi/test_mpi.f90
index 44cfeca715b..ac00e49c1b6 100644
--- a/Utilities/test_mpi/test_mpi.f90
+++ b/Utilities/test_mpi/test_mpi.f90
@@ -23,7 +23,7 @@ program test_mpi
 
         integer i, size, rank, namelen, ierr
         character (len=MPI_MAX_PROCESSOR_NAME) :: name
-        integer stat(MPI_STATUS_SIZE)
+        type(mpi_status) :: stat
 
         call MPI_INIT (ierr)