diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 36c51fe79..cce45ce9d 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -85,12 +85,6 @@ jobs:
       run: cmake --install .
       working-directory: build
 
-    - name: Test mappings
-      env:
-        DLITE_PYDEBUG: ""
-      working-directory: build
-      run: ctest -V -R mappings
-
     - name: Test
       env:
         DLITE_PYDEBUG: ""
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3fc817cb..5229d15ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,6 +336,13 @@ if(WITH_PYTHON)
   # endif()
   # message(STATUS "ENV{Python3_LIBRARY}: $ENV{Python3_LIBRARY}")
 
+  add_custom_target(wheel
+    COMMAND ${Python3_EXECUTABLE} -m pip wheel -w dist
+        ${dlite_SOURCE_DIR}/python
+    DEPENDS ${dlite}
+    COMMENT "Build Python wheels"
+  )
+
 
   message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
   message(STATUS "Python3_prefix = ${Python3_prefix}")
@@ -942,6 +949,7 @@ configure_package_config_file(
   PATH_VARS ${DLITE_CONFIG_VARS}
   )
 
+
 #################################################################
 
 # Install
diff --git a/storages/python/tests-python/CMakeLists.txt b/storages/python/tests-python/CMakeLists.txt
index 7cc78d8be..862cfff8d 100644
--- a/storages/python/tests-python/CMakeLists.txt
+++ b/storages/python/tests-python/CMakeLists.txt
@@ -78,6 +78,8 @@ foreach(test ${python-tests})
   set_property(TEST ${test} APPEND PROPERTY
     ENVIRONMENT "LD_LIBRARY_PATH=${dlite_LD_LIBRARY_PATH_NATIVE}")
   endif()
+  set_property(TEST ${name} APPEND PROPERTY
+    ENVIRONMENT "DLITE_IMPORTSKIP_EXITCODE=$ENV{DLITE_IMPORTSKIP_EXITCODE}")
 
   # Skip tests that exit with return code 44
   set_property(TEST ${test} PROPERTY SKIP_RETURN_CODE 44)