diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index 042cb9da324f246a5f8ed71062f94f7ef0253948..b91daedfa25d13891324cbf38bfbe4602d570c01 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -134,11 +134,9 @@ from pyopencl._cl import (  # noqa
         _enqueue_write_buffer_rect,
         _enqueue_copy_buffer_rect,
 
-        enqueue_map_buffer,
         _enqueue_read_image,
         _enqueue_copy_image,
         _enqueue_write_image,
-        enqueue_map_image,
         _enqueue_copy_image_to_buffer,
         _enqueue_copy_buffer_to_image,
 
@@ -152,6 +150,13 @@ from pyopencl._cl import (  # noqa
         DeviceTopologyAmd,
         )
 
+if not _PYPY:
+    # FIXME: Add back to default set when pypy support catches up
+    from pyopencl._cl import (  # noqa
+        enqueue_map_buffer,
+        enqueue_map_image,
+        )
+
 if get_cl_header_version() >= (1, 1):
     from pyopencl._cl import (  # noqa
           UserEvent,