diff --git a/package.xml b/package.xml
index bbec4158..7aadf4db 100644
--- a/package.xml
+++ b/package.xml
@@ -74,6 +74,7 @@ Fixes
    <file role='src' name='fastlz/fastlz.c'/>
    <file role='src' name='fastlz/fastlz.h'/>
    <dir name="tests">
+    <file role='test' name='skipif.inc'/>
     <file role='test' name='001.phpt'/>
     <file role='test' name='version.phpt'/>
     <file role='test' name='bug_16084.phpt'/>
@@ -143,6 +144,7 @@ Fixes
     <file role='test' name='setmulti.phpt'/>
     <file role='test' name='cachecallback.phpt'/>
     <file role='test' name='incrdecr.phpt'/>
+    <file role='test' name='incrdecr_64.phpt'/>
     <file role='test' name='incrdecr_initial.phpt'/>
     <file role='test' name='incrdecr_invalid_key.phpt'/>
     <file role='test' name='incrdecr_bykey.phpt'/>
diff --git a/tests/incrdecr_64.phpt b/tests/incrdecr_64.phpt
new file mode 100644
index 00000000..dfa32c6a
--- /dev/null
+++ b/tests/incrdecr_64.phpt
@@ -0,0 +1,39 @@
+--TEST--
+64-bit Memcached::increment() decrement() incrementByKey() decrementByKey()
+--SKIPIF--
+<?php
+include "skipif.inc";
+if (PHP_INT_SIZE < 8) die("skip valid for 64-bit PHP only");
+?>
+--FILE--
+<?php
+include dirname (__FILE__) . '/config.inc';
+$m = memc_get_instance ();
+
+echo "Normal\n";
+$m->set('foo', 1);
+var_dump($m->get('foo'));
+
+echo "Enormous offset 64-bit\n";
+$m->increment('foo', 0x100000000);
+var_dump($m->get('foo'));
+
+$m->decrement('foo', 0x100000000);
+var_dump($m->get('foo'));
+
+echo "Enormous offset 64-bit by key\n";
+$m->incrementByKey('foo', 'foo', 0x100000000);
+var_dump($m->get('foo'));
+
+$m->decrementByKey('foo', 'foo', 0x100000000);
+var_dump($m->get('foo'));
+
+--EXPECT--
+Normal
+int(1)
+Enormous offset 64-bit
+int(4294967297)
+int(1)
+Enormous offset 64-bit by key
+int(4294967297)
+int(1)