diff --git a/test_fms/mpp/test_domains_simple.F90 b/test_fms/mpp/test_domains_simple.F90
index 9308d089b..abc36adc2 100644
--- a/test_fms/mpp/test_domains_simple.F90
+++ b/test_fms/mpp/test_domains_simple.F90
@@ -24,11 +24,12 @@
 
 !> @author Ed Hartnett 6/22/20
 program test_domains_simple
+
   use mpp_mod
   use mpp_domains_mod
-
+  use platform_mod
   implicit none
-#include "../../include/fms_platform.h"
+
   integer :: pe, npes     !> This pe and the total number of pes.
   integer :: nx=40, ny=40 !> Size of our 2D domain.
   integer :: layout(2)    !> Layout of our 2D domain.
diff --git a/test_fms/mpp/test_mpp_mem_dump.F90 b/test_fms/mpp/test_mpp_mem_dump.F90
index 19c3ce393..c0f0d1ec4 100644
--- a/test_fms/mpp/test_mpp_mem_dump.F90
+++ b/test_fms/mpp/test_mpp_mem_dump.F90
@@ -27,8 +27,9 @@
 !! Test that the call to mpp_mem_dump is functional.  On a supported OS, the return value
 !! of mpp_mem_dump should be a positive integer.
 program test_mpp_mem_dump
+
   use mpp_memutils_mod, only: mpp_mem_dump
-#include "../../include/fms_platform.h"
+  use platform_mod
   implicit none
 
   real :: memuse
diff --git a/test_fms/mpp/test_mpp_memutils_begin_2x.F90 b/test_fms/mpp/test_mpp_memutils_begin_2x.F90
index c032ee632..f687bbab3 100644
--- a/test_fms/mpp/test_mpp_memutils_begin_2x.F90
+++ b/test_fms/mpp/test_mpp_memutils_begin_2x.F90
@@ -28,10 +28,10 @@
 !! code this is an error, which should be caught.  This program should exit
 !! non-zero.
 program test_mpp_memutils_init_end
-#include "../../include/fms_platform.h"
 
   use mpp_mod, only : mpp_init, mpp_exit
   use mpp_memutils_mod, only: mpp_memuse_begin, mpp_memuse_end
+  use platform_mod
   implicit none
 
   real, dimension(:), allocatable :: ralloc_mem
diff --git a/test_fms/mpp/test_mpp_memutils_begin_end.F90 b/test_fms/mpp/test_mpp_memutils_begin_end.F90
index d07a5e6ec..f017fda33 100644
--- a/test_fms/mpp/test_mpp_memutils_begin_end.F90
+++ b/test_fms/mpp/test_mpp_memutils_begin_end.F90
@@ -28,10 +28,10 @@
 !! This test will exit with status zero if successful.  The script launching this test
 !! program may, if desired, check if the memory output numbers are sane.
 program test_mpp_memutils_init_end
-#include "../../include/fms_platform.h"
 
   use mpp_mod, only : mpp_init, mpp_exit
   use mpp_memutils_mod, only: mpp_memuse_begin, mpp_memuse_end
+  use platform_mod
   implicit none
 
   real, dimension(:), allocatable :: ralloc_mem
diff --git a/test_fms/mpp/test_mpp_memutils_end_before_begin.F90 b/test_fms/mpp/test_mpp_memutils_end_before_begin.F90
index 71a3e5460..fd69c409e 100644
--- a/test_fms/mpp/test_mpp_memutils_end_before_begin.F90
+++ b/test_fms/mpp/test_mpp_memutils_end_before_begin.F90
@@ -27,10 +27,10 @@
 !! Test the error case when mpp_memuse_end() is called before mpp_memuse_begin().
 !! This test program should exit non-zero if successful.
 program test_mpp_memutils_init_end
-#include "../../include/fms_platform.h"
 
   use mpp_mod, only : mpp_init, mpp_exit
   use mpp_memutils_mod, only: mpp_memuse_begin, mpp_memuse_end
+  use platform_mod
   implicit none
 
   real, dimension(:), allocatable :: ralloc_mem
diff --git a/test_fms/mpp/test_mpp_print_memuse_stats_file.F90 b/test_fms/mpp/test_mpp_print_memuse_stats_file.F90
index c6d5ca123..389fae4c9 100644
--- a/test_fms/mpp/test_mpp_print_memuse_stats_file.F90
+++ b/test_fms/mpp/test_mpp_print_memuse_stats_file.F90
@@ -32,11 +32,11 @@
 !! successful.  The script calling the program can check if the numbers are sane, if
 !! desired.
 program test_mpp_mem_print_stats_file
-#include "../../include/fms_platform.h"
 
   use mpp_mod, only : mpp_init, mpp_exit, stdout
   use mpp_memutils_mod, only: mpp_memuse_begin, mpp_memuse_end
   use mpp_memutils_mod, only: mpp_print_memuse_stats
+  use platform_mod
   implicit none
 
   real, dimension(:), allocatable :: ralloc_mem1, ralloc_mem2
diff --git a/test_fms/mpp/test_mpp_print_memuse_stats_stderr.F90 b/test_fms/mpp/test_mpp_print_memuse_stats_stderr.F90
index 57eddc53b..dd507cd08 100644
--- a/test_fms/mpp/test_mpp_print_memuse_stats_stderr.F90
+++ b/test_fms/mpp/test_mpp_print_memuse_stats_stderr.F90
@@ -30,11 +30,11 @@
 !! successful.  The script calling the program can check if the numbers are sane, if
 !! desired.
 program test_mpp_mem_print_stats_stderr
-#include "../../include/fms_platform.h"
 
   use mpp_mod, only : mpp_init, mpp_exit
   use mpp_memutils_mod, only: mpp_memuse_begin, mpp_memuse_end
   use mpp_memutils_mod, only: mpp_print_memuse_stats
+  use platform_mod
   implicit none
 
   real, dimension(:), allocatable :: ralloc_mem1, ralloc_mem2