--- a/dataimport/test/test_pgstore.py	Fri Sep 11 15:29:25 2015 +0200
+++ b/dataimport/test/test_pgstore.py	Fri Sep 11 15:50:29 2015 +0200
@@ -20,6 +20,7 @@
 
 import datetime as DT
 
+from six import PY2
 from logilab.common.testlib import TestCase, unittest_main
 
 from cubicweb.dataimport import pgstore
@@ -36,7 +37,8 @@
     def test_convert_number(self):
         cnvt = pgstore._copyfrom_buffer_convert_number
         self.assertEqual('42', cnvt(42))
-        self.assertEqual('42', cnvt(42L))
+        if PY2:
+            self.assertEqual('42', cnvt(long(42)))
         self.assertEqual('42.42', cnvt(42.42))
 
     def test_convert_string(self):
@@ -64,9 +66,10 @@
 
     # test buffer
     def test_create_copyfrom_buffer_tuple(self):
-        data = ((42, 42L, 42.42, u'éléphant', DT.date(666, 1, 13), DT.time(6, 6, 6),
+        l = long if PY2 else int
+        data = ((42, l(42), 42.42, u'éléphant', DT.date(666, 1, 13), DT.time(6, 6, 6),
                  DT.datetime(666, 6, 13, 6, 6, 6)),
-                (6, 6L, 6.6, u'babar', DT.date(2014, 1, 14), DT.time(4, 2, 1),
+                (6, l(6), 6.6, u'babar', DT.date(2014, 1, 14), DT.time(4, 2, 1),
                  DT.datetime(2014, 1, 1, 0, 0, 0)))
         results = pgstore._create_copyfrom_buffer(data)
         # all columns