diff --git a/python/samba/compat.py b/python/samba/compat.py
index c8215f3f6af..dfdfb7dd81e 100644
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -20,3 +20,8 @@
 import sys
 
 PY3 = sys.version_info[0] == 3
+
+if PY3:
+    integer_types = int,
+else:
+    integer_types = (int, long)
diff --git a/python/samba/tests/messaging.py b/python/samba/tests/messaging.py
index 41834c1a110..2a3685fee29 100644
--- a/python/samba/tests/messaging.py
+++ b/python/samba/tests/messaging.py
@@ -26,6 +26,8 @@ from samba.ndr import ndr_print
 from samba.dcerpc import server_id
 import random
 import os
+from samba.compat import integer_types
+
 
 class MessagingTests(TestCase):
 
@@ -38,7 +40,7 @@ class MessagingTests(TestCase):
         def callback():
             pass
         msg_type = x.register((callback, None))
-        self.assertTrue(isinstance(msg_type, long))
+        self.assertTrue(isinstance(msg_type, integer_types))
         x.deregister(callback, msg_type)
 
     def test_all_servers(self):
diff --git a/selftest/tests.py b/selftest/tests.py
index 639bc63649d..704dbad3b73 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -73,7 +73,8 @@ planpythontestsuite("none", "samba.tests.dcerpc.rpc_talloc")
 planpythontestsuite("none", "samba.tests.dcerpc.array")
 planpythontestsuite("none", "samba.tests.dcerpc.string")
 planpythontestsuite("none", "samba.tests.hostconfig")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.messaging")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.messaging",
+                    py3_compatible=True)
 planpythontestsuite("none", "samba.tests.samba3sam")
 planpythontestsuite(
     "none", "wafsamba.tests.test_suite",