--- a/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template	Wed Jun 15 07:58:56 2016 +0200
+++ b/hotspot/test/compiler/unsafe/X-UnsafeAccessTest.java.template	Wed Jun 15 11:21:36 2016 +0300
@@ -333,7 +333,7 @@
             $type$ o = UNSAFE.getAndAdd$Type$(base, offset, $value2$);
             assertEquals(o, $value1$, "getAndAdd $type$");
             $type$ x = UNSAFE.get$Type$(base, offset);
-            assertEquals(x, $value1$ + $value2$, "getAndAdd $type$");
+            assertEquals(x, ($type$)($value1$ + $value2$), "getAndAdd $type$");
         }
 #end[AtomicAdd]
     }