diff --git a/gcc/testsuite/gnat.dg/opt58.adb b/gcc/testsuite/gnat.dg/opt58.adb
index ac39cc06056e029bc745411c6a7f97dfc3c192f7..16326ae615f2aecc4121517f378b9f0cfb975984 100644
--- a/gcc/testsuite/gnat.dg/opt58.adb
+++ b/gcc/testsuite/gnat.dg/opt58.adb
@@ -1,19 +1,19 @@
--- { dg-do compile }
--- { dg-options "-O" }
-
-with Unchecked_Conversion;
-with System; use System;
-with Opt58_Pkg; use Opt58_Pkg;
-
-procedure Opt58 is
-
-   function Convert is new Unchecked_Conversion (Integer, Rec);
-
-   Dword : Integer := 0;
-   I : Small_Int := F1 (Convert (Dword));
-
-begin
-   if F2 (Null_Address, I = 0) then
-      null;
-   end if;
-end Opt58;
+-- { dg-do compile }
+-- { dg-options "-O -gnatws" }
+
+with Unchecked_Conversion;
+with System; use System;
+with Opt58_Pkg; use Opt58_Pkg;
+
+procedure Opt58 is
+
+   function Convert is new Unchecked_Conversion (Integer, Rec);
+
+   Dword : Integer := 0;
+   I : Small_Int := F1 (Convert (Dword));
+
+begin
+   if F2 (Null_Address, I = 0) then
+      null;
+   end if;
+end Opt58;
diff --git a/gcc/testsuite/gnat.dg/opt58_pkg.ads b/gcc/testsuite/gnat.dg/opt58_pkg.ads
index 9cb7f3a2540f65ee7ed024aca367bc61662f2d55..02a374fd1e95517ad84fc330305cdda4b1963cc8 100644
--- a/gcc/testsuite/gnat.dg/opt58_pkg.ads
+++ b/gcc/testsuite/gnat.dg/opt58_pkg.ads
@@ -1,19 +1,19 @@
-with System; use System;
-
-package Opt58_Pkg is
-
-   pragma Pure (Opt58_Pkg);
-
-   type Small_Int is range 0 .. 255;
-
-   type Rec is record
-     D1, D2, D3, D4 : Small_Int;
-   end record;
-   pragma Pack (Rec);
-   for Rec'Size use 32;
-
-   function F1 (R : Rec) return Small_Int;
-
-   function F2 (A : Address; B : Boolean) return Boolean;
-
-end Opt58_Pkg;
+with System; use System;
+
+package Opt58_Pkg is
+
+   pragma Pure (Opt58_Pkg);
+
+   type Small_Int is range 0 .. 255;
+
+   type Rec is record
+     D1, D2, D3, D4 : Small_Int;
+   end record;
+   pragma Pack (Rec);
+   for Rec'Size use 32;
+
+   function F1 (R : Rec) return Small_Int;
+
+   function F2 (A : Address; B : Boolean) return Boolean;
+
+end Opt58_Pkg;