diff --git a/CMakeLists.txt b/CMakeLists.txt
index bffe31d..c3f2db6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 find_package(OpenSSL REQUIRED)
 
 if(NOT CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
-  find_package(nlohmann_json  REQUIRED)
+  find_package(nlohmann_json REQUIRED)
 endif()
 
 # ##############################################################################
@@ -30,8 +30,9 @@ add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(
   ${PROJECT_NAME}
   INTERFACE $<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_link_libraries(${PROJECT_NAME} INTERFACE OpenSSL::SSL)
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+            ${OpenSSL_INCLUDE_DIR})
+target_link_libraries(${PROJECT_NAME} INTERFACE ${OpenSSL_LIBRARIES})
 if(NOT CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
   target_link_libraries(${PROJECT_NAME} INTERFACE nlohmann_json::nlohmann_json)
   add_definitions(-DCPP_JWT_USE_VENDORED_NLOHMANN_JSON)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a1e4094..12245d9 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -3,21 +3,21 @@ set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -DCERT_ROOT_DIR=\"\\\"${CERT_ROOT_DIR}\\\"\"")
 
 add_executable(simple_ex1 simple_ex1.cc)
-target_link_libraries(simple_ex1 OpenSSL::SSL ${PROJECT_NAME})
+target_link_libraries(simple_ex1 ${PROJECT_NAME})
 add_test(
   NAME simple_ex1
   COMMAND ./simple_ex1
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(simple_ex2 simple_ex2.cc)
-target_link_libraries(simple_ex2 OpenSSL::SSL ${PROJECT_NAME})
+target_link_libraries(simple_ex2 ${PROJECT_NAME})
 add_test(
   NAME simple_ex2
   COMMAND ./simple_ex2
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(simple_ex3_rsa simple_ex3_rsa.cc)
-target_link_libraries(simple_ex3_rsa OpenSSL::SSL ${PROJECT_NAME})
+target_link_libraries(simple_ex3_rsa ${PROJECT_NAME})
 add_test(
   NAME simple_ex3_rsa
   COMMAND ./simple_ex3_rsa
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 48cf4b8..e423283 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,31 +1,64 @@
-
-SET(CERT_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/certs")
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DCERT_ROOT_DIR=\"\\\"${CERT_ROOT_DIR}\\\"\"")
+set(CERT_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/certs")
+set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -DCERT_ROOT_DIR=\"\\\"${CERT_ROOT_DIR}\\\"\"")
 
 add_executable(test_jwt_object test_jwt_object.cc)
-target_link_libraries(test_jwt_object OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_object COMMAND ./test_jwt_object WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_object ${GTest_LIBRARIES} ${PROJECT_NAME})
+target_include_directories(test_jwt_object PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_object
+  COMMAND ./test_jwt_object
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_jwt_encode test_jwt_encode.cc)
-target_link_libraries(test_jwt_encode OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_encode COMMAND ./test_jwt_encode WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_encode ${GTest_LIBRARIES} ${PROJECT_NAME})
+target_include_directories(test_jwt_encode PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_encode
+  COMMAND ./test_jwt_encode
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_jwt_decode test_jwt_decode.cc)
-target_link_libraries(test_jwt_decode OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_decode COMMAND ./test_jwt_decode WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_decode ${GTest_LIBRARIES} ${PROJECT_NAME})
+target_include_directories(test_jwt_decode PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_decode
+  COMMAND ./test_jwt_decode
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_jwt_decode_verifiy test_jwt_decode_verifiy.cc)
-target_link_libraries(test_jwt_decode_verifiy OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_decode_verifiy COMMAND ./test_jwt_decode_verifiy WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_decode_verifiy ${GTest_LIBRARIES}
+                      ${PROJECT_NAME})
+target_include_directories(test_jwt_decode_verifiy
+                           PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_decode_verifiy
+  COMMAND ./test_jwt_decode_verifiy
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(test_jwt_decode_verifiy_with_exception test_jwt_decode_verifiy_with_exception.cc)
-target_link_libraries(test_jwt_decode_verifiy_with_exception OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_decode_verifiy_with_exception COMMAND ./test_jwt_decode_verifiy_with_exception WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+add_executable(test_jwt_decode_verifiy_with_exception
+               test_jwt_decode_verifiy_with_exception.cc)
+target_link_libraries(test_jwt_decode_verifiy_with_exception ${GTest_LIBRARIES}
+                      ${PROJECT_NAME})
+target_include_directories(test_jwt_decode_verifiy_with_exception
+                           PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_decode_verifiy_with_exception
+  COMMAND ./test_jwt_decode_verifiy_with_exception
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_jwt_rsa test_jwt_rsa.cc)
-target_link_libraries(test_jwt_rsa OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_rsa COMMAND ./test_jwt_rsa WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_rsa ${GTest_LIBRARIES} ${PROJECT_NAME})
+target_include_directories(test_jwt_rsa PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_rsa
+  COMMAND ./test_jwt_rsa
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(test_jwt_es test_jwt_es.cc)
-target_link_libraries(test_jwt_es OpenSSL::SSL GTest::GTest GTest::Main ${PROJECT_NAME})
-add_test(NAME test_jwt_es COMMAND ./test_jwt_es WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(test_jwt_es ${GTest_LIBRARIES} ${PROJECT_NAME})
+target_include_directories(test_jwt_es PRIVATE ${GTEST_INCLUDE_DIRS})
+add_test(
+  NAME test_jwt_es
+  COMMAND ./test_jwt_es
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})