diff --git a/opac/changelanguage.pl b/opac/changelanguage.pl
index 9a470aef64..16ef6d0f22 100755
--- a/opac/changelanguage.pl
+++ b/opac/changelanguage.pl
@@ -15,6 +15,9 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+#use strict;
+#use warnings; FIXME - Bug 2505
+
 use C4::Output;
 use CGI;
 
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 772b7f34d0..634b77a9db 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -17,6 +17,7 @@
 
 
 use strict;
+#use warnings; FIXME - Bug 2505
 
 use CGI;