diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bc55d701dbf..91fea82ee27 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-17  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/watch_arg/watch.adb: Rewrite testcase to avoid the
+	parameter that we want to watch being a constant.
+
 2010-05-17  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/cond_lang: New testcase.
diff --git a/gdb/testsuite/gdb.ada/watch_arg/watch.adb b/gdb/testsuite/gdb.ada/watch_arg/watch.adb
index b95e3a0d655..3b7cb27a727 100644
--- a/gdb/testsuite/gdb.ada/watch_arg/watch.adb
+++ b/gdb/testsuite/gdb.ada/watch_arg/watch.adb
@@ -15,15 +15,15 @@
 
 procedure Watch is
 
-   procedure Foo (X : access Integer) is
+   procedure Foo (X : in out Integer) is
    begin
-      X.all := 3;  -- BREAK1
+      X := 3;  -- BREAK1
    end Foo;
 
-   X : aliased Integer := 1;
+   X : Integer := 1;
 
 begin
-   Foo (X'Access);
+   Foo (X);
    X := 2;  -- BREAK2
 end Watch;