diff --git a/CMakeLists.txt b/CMakeLists.txt
index d07e3b692f8..80e9484ccf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -466,6 +466,12 @@ IF (APPLE AND ENABLE_TESTS)
   EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
     "${CMAKE_CURRENT_BINARY_DIR}/Plugins"
     "${CMAKE_CURRENT_BINARY_DIR}/output/Plugins")
+  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+    "${CMAKE_CURRENT_BINARY_DIR}/Plugins/qgis/qgisgrass.framework"
+    "${CMAKE_CURRENT_BINARY_DIR}/output/lib/qgisgrass.framework")
+  EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+    "${CMAKE_CURRENT_BINARY_DIR}/Plugins/qgis/qgissqlanyconnection.framework"
+    "${CMAKE_CURRENT_BINARY_DIR}/output/lib/qgissqlanyconnection.framework")
 ENDIF (APPLE AND ENABLE_TESTS)
 
 # manual page - makes sense only on unix systems
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1ef2b34162a..e6d1a66b08d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,8 @@
 IF (ENABLE_TESTS)
+  IF (APPLE)
+    # override default data path, otherwise looks for Resources in app bundle
+    SET (QGIS_DATA_SUBDIR    "${CMAKE_CURRENT_SOURCE_DIR}/resources")
+  ENDIF (APPLE)
   ADD_SUBDIRECTORY(src)
   ADD_SUBDIRECTORY(bench)
 ENDIF (ENABLE_TESTS)