diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index 7590ec0947..2ae4f4a3a3 100755
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -21,7 +21,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-# use warnings;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Debug;
 use C4::Context;
diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl
index a33d836226..905af94396 100755
--- a/circ/branchoverdues.pl
+++ b/circ/branchoverdues.pl
@@ -17,7 +17,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-# use warnings;  # FIXME
+#use warnings; FIXME - Bug 2505
 use C4::Context;
 use CGI;
 use C4::Output;
diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl
index 2ebd0d06dc..e4aef3b199 100755
--- a/circ/circulation-home.pl
+++ b/circ/circulation-home.pl
@@ -17,6 +17,7 @@
 # 
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Auth;
 use C4::Output;
diff --git a/circ/circulation.pl b/circ/circulation.pl
index ee13b9d89f..4b679208d2 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -21,7 +21,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-# use warnings;  # FIXME
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Output;
 use C4::Print;
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index fa75d107d1..f581464bfd 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -19,6 +19,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Output;
 use CGI;
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 416e690410..cf71094830 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -24,6 +24,7 @@
 # 		The reserve pull lists *works* as long as not for indepencdant branches, I can fix!
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Output;
 use CGI;
diff --git a/circ/returns.pl b/circ/returns.pl
index e3f6bb2057..261109962b 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -26,7 +26,7 @@ script to execute returns of books
 =cut
 
 use strict;
-# use warnings; # FIXME
+#use warnings; FIXME - Bug 2505
 
 use CGI;
 use C4::Context;
diff --git a/circ/stats.pl b/circ/stats.pl
index 827bc540fc..558a985c96 100755
--- a/circ/stats.pl
+++ b/circ/stats.pl
@@ -22,7 +22,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-# use warnings;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Context;
 use C4::Output;
diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index 9c3dc3d5b9..f8fc52a885 100755
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -25,6 +25,7 @@
 =cut
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Context;
 use C4::Auth qw/check_cookie_auth/;