diff --git a/.github/workflows/cmake_actions.yml b/.github/workflows/cmake_actions.yml
index 86393af2..2d0d0147 100644
--- a/.github/workflows/cmake_actions.yml
+++ b/.github/workflows/cmake_actions.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         cc:          [gcc, clang]
         cmake_flags: ["",
-                      "-DBUILD_EXAMPLES=ON       -DBUILD_TESTS=OFF",
+                      "-DBUILD_EXAMPLES=ON       -DBUILD_TESTS=ON",
                       "-DUSE_DTOA_LIBRARY=ON     -DBUILD_TESTS=ON",
                       "-DUSE_FMEMOPEN=ON         -DBUILD_TESTS=ON",
                       "-DUSE_NO_MD5=ON           -DBUILD_TESTS=ON",
diff --git a/.github/workflows/make_actions.yml b/.github/workflows/make_actions.yml
index af263dfc..74d3f312 100644
--- a/.github/workflows/make_actions.yml
+++ b/.github/workflows/make_actions.yml
@@ -1,4 +1,4 @@
-name: Build with make
+name: Build with Make
 
 on:
   push:
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index a926134a..99274930 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -25,4 +25,4 @@ jobs:
         sudo apt-get -y install zlib1g-dev
 
     - name: test valgrind
-      run: make test_valgrind V=1
+      run: make test_valgrind V=1 -j
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf71509d..49e6d247 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,11 +259,11 @@ if(NOT USE_OPENSSL_MD5 AND NOT USE_NO_MD5)
 endif()
 
 if(USE_OPENSSL_MD5)
-	find_package(OpenSSL REQUIRED)
-	if(OpenSSL_FOUND)
-	    include_directories(${OPENSSL_INCLUDE_DIR})
-	    message(STATUS "OpenSSL version: ${OPENSSL_VERSION}")
-	endif()
+    find_package(OpenSSL REQUIRED)
+    if(OpenSSL_FOUND)
+        include_directories(${OPENSSL_INCLUDE_DIR})
+        message(STATUS "OpenSSL version: ${OPENSSL_VERSION}")
+    endif()
 endif()
 
 if (USE_DTOA_LIBRARY)
@@ -366,12 +366,11 @@ if(BUILD_TESTS)
         message("    pip install pytest\n")
     endif()
 
-    set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/test/functional/src )
-
     foreach(source ${LXW_FUNCTIONAL_SOURCES})
        get_filename_component(basename ${source} NAME_WE)
        add_executable(${basename} ${source})
        target_link_libraries(${basename} xlsxwriter)
+       set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "test/functional/src")
     endforeach(source)
 
     add_custom_command(TARGET xlsxwriter_unit POST_BUILD
@@ -401,6 +400,7 @@ if(BUILD_EXAMPLES)
         get_filename_component(basename ${source} NAME_WE)
         add_executable(${basename} ${source})
         target_link_libraries(${basename} ${PROJECT_NAME})
+        set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "examples")
     endforeach(source)
 endif()