diff --git a/CMakeLists.txt b/CMakeLists.txt
index 941ff39a0..c556488a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,10 +103,16 @@ ENDIF()
 
 # set paths
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
-SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
+# put executables into bundle dir on on osx
+IF(APPLE)
+    SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS/" )
+ELSE()
+    SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
+ENDIF()
+
 # make predefined install dirs available everywhere
 INCLUDE( GNUInstallDirs )
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index a02772c55..618b0db4d 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -3,6 +3,8 @@ setup_qt()
 
 enable_testing()
 
+SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests" )
+
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../src/tomahawk ${CMAKE_CURRENT_LIST_DIR}/../src/libtomahawk)
 include(tomahawk_add_test.cmake)
 
diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index b6ab80afb..f11b3a4e4 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -162,6 +162,9 @@ SET_TARGET_PROPERTIES(tomahawk_bin
         AUTOMOC TRUE
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist"
         RUNTIME_OUTPUT_NAME tomahawk
+
+        # OSX: MACOSX_BUNDLE messes with paths
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
 )