diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a2008d6dde07e38f9f0961a1be266c4fee582b9c..fac1cecb8f757006a13359de997f86cce37b50a5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-10  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gcc.target/s390/htm-builtins-compile-1.c: Replace long long with
+	long.
+
 2014-04-10  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
 	PR debug/60655
diff --git a/gcc/testsuite/gcc.target/s390/htm-builtins-compile-1.c b/gcc/testsuite/gcc.target/s390/htm-builtins-compile-1.c
index c1b98e2bba4935aebae427d5b8027ed61beed73f..982a7483dbe7032ea445a9b53091bf03d084df8d 100644
--- a/gcc/testsuite/gcc.target/s390/htm-builtins-compile-1.c
+++ b/gcc/testsuite/gcc.target/s390/htm-builtins-compile-1.c
@@ -27,8 +27,8 @@ foo (struct __htm_tdb* tdb, int reg, int *mem, uint64_t *mem64)
   cc = __builtin_tbegin ((void *)0x12345678);
   cc = __builtin_tbegin (tdb);
   cc = __builtin_tbegin (&global_tdb);
-  cc = __builtin_tbegin ((void *)(long long)(reg + 0x12345678));
-  cc = __builtin_tbegin ((void *)(long long)(reg));
+  cc = __builtin_tbegin ((void *)(long)(reg + 0x12345678));
+  cc = __builtin_tbegin ((void *)(long)(reg));
 
   __builtin_tbegin_nofloat ((void *)0);
   __builtin_tbegin_nofloat ((void *)-99999);
@@ -36,8 +36,8 @@ foo (struct __htm_tdb* tdb, int reg, int *mem, uint64_t *mem64)
   cc = __builtin_tbegin_nofloat ((void *)0x12345678);
   cc = __builtin_tbegin_nofloat (tdb);
   cc = __builtin_tbegin_nofloat (&global_tdb);
-  cc = __builtin_tbegin_nofloat ((void *)(long long)(reg + 0x12345678));
-  cc = __builtin_tbegin_nofloat ((void *)(long long)(reg));
+  cc = __builtin_tbegin_nofloat ((void *)(long)(reg + 0x12345678));
+  cc = __builtin_tbegin_nofloat ((void *)(long)(reg));
 
   __builtin_tbegin_retry ((void *)0, 0);
   cc = __builtin_tbegin_retry ((void *)0, 1);
@@ -50,9 +50,9 @@ foo (struct __htm_tdb* tdb, int reg, int *mem, uint64_t *mem64)
   cc = __builtin_tbegin_retry (&global_tdb, 42);
   cc = __builtin_tbegin_retry ((void *)0x12345678, global);
   cc = __builtin_tbegin_retry (
-	  (void *)(long long) (reg + 0x12345678), global + 1);
+	  (void *)(long) (reg + 0x12345678), global + 1);
   cc = __builtin_tbegin_retry (
-	  (void *)(long long)(reg), global - 1);
+	  (void *)(long)(reg), global - 1);
 
   __builtin_tbegin_retry_nofloat ((void *)0, 0);
   cc = __builtin_tbegin_retry_nofloat ((void *)0, 1);
@@ -65,9 +65,9 @@ foo (struct __htm_tdb* tdb, int reg, int *mem, uint64_t *mem64)
   cc = __builtin_tbegin_retry_nofloat (&global_tdb, 42);
   cc = __builtin_tbegin_retry_nofloat ((void *)0x12345678, global);
   cc = __builtin_tbegin_retry_nofloat (
-	  (void *)(long long) (reg + 0x12345678), global + 1);
+	  (void *)(long) (reg + 0x12345678), global + 1);
   cc = __builtin_tbegin_retry_nofloat (
-	  (void *)(long long)(reg), global - 1);
+	  (void *)(long)(reg), global - 1);
 
   __builtin_tbeginc ();