diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9c3570c1cab..a2ca2c86716 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-19  Andrea Azzarone  <azzaronea@gmail.com>
+
+	* g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
+	(size_type): New typedef.
+	(operator "" _script): Use it for the last argument.
+
 2015-02-19  Maxim Kuvyrkov  <maxim.kuvyrkov@linaro.org>
 
         * gcc.dg/pr64935-1.c, gcc.dg/pr64935-2.c: New tests.
diff --git a/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C b/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
index 2eb6a7daf20..6e3ffe4ecd3 100644
--- a/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
+++ b/gcc/testsuite/g++.dg/cpp1y/udlit-char-template-vs-std-literal-operator.C
@@ -2,12 +2,14 @@
 
 #include <cassert>
 
+typedef decltype(sizeof(0)) size_type;
+
 template<typename CharT, CharT... String>
 int operator"" _script () {
   return 1;
 }
 
-int operator"" _script (const char*, unsigned long) {
+int operator"" _script (const char*, size_type) {
   return 2;
 }