diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
index 3cceef992..fafd0fb53 100644
--- a/.github/workflows/CI-unixish.yml
+++ b/.github/workflows/CI-unixish.yml
@@ -280,23 +280,6 @@ jobs:
           qmake CONFIG+=debug CONFIG+=ccache
           make -j$(nproc)
 
-  build_fuzz:
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04] # only needs to build on ubuntu
-      fail-fast: false # Prefer quick result
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build Fuzzer
-        run: |
-          pushd oss-fuzz
-          make -j$(nproc) CXX=clang++ CXXFLAGS="-fsanitize=address" fuzz-client translate
-
   build:
 
     strategy:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d0000bda..b93904832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,6 @@ add_subdirectory(cli)   # Client application
 add_subdirectory(test)  # Tests
 add_subdirectory(gui)   # Graphical application
 add_subdirectory(tools/triage)   # Triage tool
-add_subdirectory(oss-fuzz) # OSS-Fuzz clients
 add_subdirectory(tools)
 
 include(cmake/clang_tidy.cmake)
diff --git a/cmake/options.cmake b/cmake/options.cmake
index e9cba1f5d..ab27e74e8 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -38,7 +38,6 @@ endif()
 option(BUILD_TESTS          "Build tests"                                                   OFF)
 option(REGISTER_TESTS       "Register tests in CTest"                                       ON)
 option(ENABLE_CHECK_INTERNAL "Enable internal checks"                                       OFF)
-option(ENABLE_OSS_FUZZ      "Enable the OSS-Fuzz related targets"                           ON)
 
 option(BUILD_GUI            "Build the qt application"                                      OFF)
 option(WITH_QCHART          "Enable QtCharts usage in the GUI"                              OFF)
diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake
index 716db34bb..288319506 100644
--- a/cmake/printInfo.cmake
+++ b/cmake/printInfo.cmake
@@ -45,7 +45,6 @@ if(BUILD_TESTS)
     message( STATUS "REGISTER_TESTS =        ${REGISTER_TESTS}" )
 endif()
 message( STATUS "ENABLE_CHECK_INTERNAL = ${ENABLE_CHECK_INTERNAL}" )
-message( STATUS "ENABLE_OSS_FUZZ =       ${ENABLE_OSS_FUZZ}" )
 message( STATUS )
 message( STATUS "BUILD_GUI =             ${BUILD_GUI}" )
 if (BUILD_GUI)
diff --git a/oss-fuzz/CMakeLists.txt b/oss-fuzz/CMakeLists.txt
deleted file mode 100644
index a41168cf7..000000000
--- a/oss-fuzz/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(fuzz-client_SRC
-            main.cpp
-            type2.cpp
-    )
-    if(USE_BUNDLED_TINYXML2)
-        list(APPEND fuzz-client_SRC $<TARGET_OBJECTS:tinyxml2_objs>)
-    endif()
-    add_executable(fuzz-client EXCLUDE_FROM_ALL
-            ${fuzz-client_SRC}
-            $<TARGET_OBJECTS:simplecpp_objs>
-            $<TARGET_OBJECTS:cppcheck-core>)
-    target_include_directories(fuzz-client PRIVATE ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/externals/simplecpp ${CMAKE_SOURCE_DIR}/externals)
-    if(USE_BUNDLED_TINYXML2)
-        target_include_directories(fuzz-client PRIVATE ${CMAKE_SOURCE_DIR}/externals/tinyxml2/)
-    endif()
-    target_compile_options(fuzz-client PRIVATE -fsanitize=fuzzer)
-    # TODO: target_link_options() requires CMake >= 3.13
-    #target_link_options(fuzz-client PRIVATE -fsanitize=fuzzer)
-    target_link_libraries(fuzz-client PRIVATE -fsanitize=fuzzer)
-    if (HAVE_RULES)
-        target_link_libraries(fuzz-client PRIVATE ${PCRE_LIBRARY})
-    endif()
-    if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
-        target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})
-    endif()
-
-    add_executable(translate EXCLUDE_FROM_ALL
-            translate.cpp
-            type2.cpp)
-endif()
diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
index ccd5e112c..b3a9b6ce9 100644
--- a/oss-fuzz/Makefile
+++ b/oss-fuzz/Makefile
@@ -3,7 +3,7 @@
 # ====================
 #
 # Local libfuzzer client:
-# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
+# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" LIB_FUZZING_ENGINE="-fsanitize=fuzzer" oss-fuzz-client
 
 CPPCHECK_DIR=..
 INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/picojson -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml2 -I ${CPPCHECK_DIR}/externals
@@ -14,11 +14,8 @@ all:	oss-fuzz-client	translate
 oss-fuzz-client:	main.cpp	type2.cpp	type2.h
 	${CXX} -std=c++11 -g ${CXXFLAGS} -o oss-fuzz-client ${INCLUDE_DIR} ${SRC_FILES} ${LIB_FUZZING_ENGINE}
 
-fuzz-client:	main.cpp	type2.cpp	type2.h
-	${CXX} -std=c++11 -g ${CXXFLAGS} -o fuzz-client ${INCLUDE_DIR} ${SRC_FILES} -fsanitize=fuzzer
-
 translate:	translate.cpp	type2.cpp	type2.h
 	${CXX} -std=c++11 -g ${CXXFLAGS} -o translate type2.cpp translate.cpp
 
 clean:
-	rm -f oss-fuzz-client fuzz-client translate
+	rm -f oss-fuzz-client translate