diff --git a/src/robotremoteserver.py b/src/robotremoteserver.py
index 0da8154..62fc5ed 100644
--- a/src/robotremoteserver.py
+++ b/src/robotremoteserver.py
@@ -15,7 +15,6 @@
 
 from __future__ import print_function
 
-from collections import Mapping
 import inspect
 import os
 import re
@@ -29,11 +28,13 @@
     from SimpleXMLRPCServer import SimpleXMLRPCServer
     from StringIO import StringIO
     from xmlrpclib import Binary, ServerProxy
+    from collections import Mapping
     PY2, PY3 = True, False
 else:
     from io import StringIO
     from xmlrpc.client import Binary, ServerProxy
     from xmlrpc.server import SimpleXMLRPCServer
+    from collections.abc import Mapping
     PY2, PY3 = False, True
     unicode = str
     long = int
diff --git a/test/libs/Returning.py b/test/libs/Returning.py
index 9d897ac..c662b4a 100644
--- a/test/libs/Returning.py
+++ b/test/libs/Returning.py
@@ -1,4 +1,9 @@
-from collections import Mapping
+import sys
+
+if sys.version_info < (3,):
+    from collections import Mapping
+else:
+    from collections.abc import Mapping
 
 
 class Returning(object):