diff --git a/tests/test_gf_unpack2.F90 b/tests/test_gf_unpack2.F90
index 4d7c2c89..8710da5f 100644
--- a/tests/test_gf_unpack2.F90
+++ b/tests/test_gf_unpack2.F90
@@ -7,7 +7,7 @@ program test_gf_unpack2
   implicit none
 
   character, dimension(269) :: fgrib
-  integer :: n1, n2, n3, nan, fgrib_len
+  integer :: n1, n2, n3, fgrib_len
   integer :: iofst, lencsec2, ierr
   integer :: numlocal, numfields
   integer :: listsec0(3), listsec1(13), maxvals(7)
@@ -76,8 +76,8 @@ end subroutine gf_unpack2
        & char(0), char(0), char(0), char(47), char(5),  char(0),  &
        & char(0), char(0), char(100), char(0), char(2),  char(0), &
        & char(0), char(0), char(0), char(0), char(0),  char(0),   &
-       & char(1), char(8), char(1), char(1), char(1), char(Nan),  &
-       & char(Nan), char(Nan), char(Nan), char(0), char(0),        &
+       & char(1), char(8), char(1), char(1), char(1), char(0),  &
+       & char(0), char(0), char(0), char(0), char(0),        &
        & char(0), char(0), char(0), char(0), char(0), char(0),    &
        & char(0), char(0), char(0), char(0), char(0), char(0),    &
        & char(0), char(0), char(0), char(0), char(0), char(0),    &
@@ -87,7 +87,7 @@ end subroutine gf_unpack2
        & char(0), char(0), char(0), char(12), char(7),  char(1),  &
        & char(0), char(0), char(0), char(0), char(0),  char(0),   &
                                 ! section 8
-       & "7", "7", "7", "7" /) 
+       & "7", "7", "7", "7" /)
 
   print *, ''//NEW_LINE('A')//'Calling grib_info ...'
   call gribinfo(fgrib, fgrib_len, listsec0, listsec1,  &
diff --git a/tests/test_index_gdas.F90 b/tests/test_index_gdas.F90
index 53ac7b84..474e66ca 100644
--- a/tests/test_index_gdas.F90
+++ b/tests/test_index_gdas.F90
@@ -302,7 +302,7 @@ end subroutine getgb2s
      if (i .eq. 2) then
         call getidx(LUGB, LUGI, cbuf, nlen, nnum, iret)
      elseif (i .eq. 3) then
-        call getidx(LUGB, LUGI * -1, cbuf, nlen, nnum, iret)
+        call getidx(LUGB, LUGI * (-1), cbuf, nlen, nnum, iret)
      else
         call getidx(LUGB, 0, cbuf, nlen, nnum, iret)
      endif
diff --git a/tests/test_mkieee.F90 b/tests/test_mkieee.F90
index e629dc76..c5d234fd 100644
--- a/tests/test_mkieee.F90
+++ b/tests/test_mkieee.F90
@@ -9,7 +9,7 @@ program test_mkieee
 #ifdef KIND_4
   integer, parameter :: num = 9
   real :: rieee(num)
-  real :: a(num) = (/ real :: 4.3, 5.6, 1.67, 2.33, -4.3, 0.33, 0.0, -400.0, 101029284739847594/)
+  real :: a(num) = (/ real :: 4.3, 5.6, 1.67, 2.33, -4.3, 0.33, 0.0, -400.0, 101029284739847594.0/)
   real :: b(num)
   integer :: i