--- gcc/testsuite/gfortran.dg/large_real_kind_2.F90.orig
+++ gcc/testsuite/gfortran.dg/large_real_kind_2.F90
@@ -1,6 +1,6 @@
 ! { dg-do run }
 ! { dg-require-effective-target fortran_large_real }
-! { dg-xfail-if "" { "*-*-freebsd*" } { "*" }  { "" } }
+! { dg-skip-if "Requires cpowl,coshl,sinhl,tanhl,acoshl,asinhl,atanhl,expl,logl,ccosl,csinl,cexpl,clogl" { "x86_64-*-freebsd* x86_64-*-dragonfly* x86_64-*-netbsd*" } { "*" }  { "" } }
 
 ! Testing library calls on large real kinds (larger than kind=8)
   implicit none
--- gcc/testsuite/gfortran.dg/large_real_kind_3.F90.orig
+++ gcc/testsuite/gfortran.dg/large_real_kind_3.F90
@@ -1,6 +1,6 @@
 ! { dg-do run }
 ! { dg-require-effective-target fortran_large_real }
-! { dg-xfail-if "" { "*-*-freebsd*" } { "*" }  { "" } }
+! { dg-skip-if "Requires erfl,erfcl with -O0" { "x86_64-*-freebsd* x86_64-*-dragonfly* x86_64-*-netbsd*" } { "-O0" }  { "" } }
 
 ! Testing erf and erfc library calls on large real kinds (larger than kind=8)
   implicit none
--- gcc/testsuite/gfortran.dg/open_errors.f90.orig
+++ gcc/testsuite/gfortran.dg/open_errors.f90
@@ -22,7 +22,7 @@
 if (msg /= "File 'temptestfile' does not exist") call abort()
 
 open(77,file="./", iomsg=msg, iostat=i)
-if (msg /= "'./' is a directory" .and. msg /= "Invalid argument") call abort()
+if (msg /= "'./' is a directory" .and. msg /= "Invalid argument" .and. msg /= "File './' already exists") call abort()
 
 open(77,file=n,status="new")
 i = chmod(n, "-w")