diff --git a/.appveyor.yml b/.appveyor.yml
index d92e4739..8fe3ab76 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,4 +17,4 @@ build:
   project: $(APPVEYOR_BUILD_FOLDER)\Ark-Cpp-Client.sln
     
 test_script:
-- cmd: '%APPVEYOR_BUILD_FOLDER%\Bin\%CONFIGURATION%\Ark-Cpp-Client-tests.exe'
+- cmd: '%APPVEYOR_BUILD_FOLDER%\test\%CONFIGURATION%\Ark-Cpp-Client-tests.exe'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98ea23b7..d8f70caa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD 11)
 
 set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR})
 
+set(BUILD_SHARED_LIBS OFF)
+
 if (MSVC)
   add_definitions(
     -D_CRT_SECURE_NO_WARNINGS
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4650c56..7c3433a0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,14 +48,23 @@ include_directories(${PROJECT_SOURCE_DIR})
 set(BUILD_TESTING OFF)
 set(HTTP_ONLY ON)
 set(CMAKE_USE_LIBSSH2 OFF)
+set(CURL_STATICLIB true)
+set(CURL_STATIC_CRT ON)
+set(BUILD_CURL_EXE false)
+
+if (APPLE)
+  set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl/lib")
+  set(OPENSSL_INCLUDE_DIR "/usr/local/opt/openssl/include")
+endif()
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/lib/curl)
 
 include_directories(${PROJECT_SOURCE_DIR}/lib/curl/include)
 
-if (UNIX AND NOT APPLE)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/lib/curl)
-	target_link_libraries(${PROJECT_NAME} PUBLIC libcurl)
+if (APPLE)
+  target_link_libraries(${PROJECT_NAME} PUBLIC CURL)
 else()
-	target_link_libraries(${PROJECT_NAME} PUBLIC CURL)
+	target_link_libraries(${PROJECT_NAME} PUBLIC libcurl)
 endif()
 
 # ------------------------------------------------------------------------------