diff --git a/imageproc/tests/main.cpp b/imageproc/tests/main.cpp
index 8138ef7fb..4bdcc20ec 100644
--- a/imageproc/tests/main.cpp
+++ b/imageproc/tests/main.cpp
@@ -22,4 +22,4 @@
 
 #define BOOST_AUTO_TEST_MAIN
 
-#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/included/unit_test.hpp>
diff --git a/packaging/osx/buildscantailor.sh b/packaging/osx/buildscantailor.sh
index 1ffca09ee..5f8aa45d9 100755
--- a/packaging/osx/buildscantailor.sh
+++ b/packaging/osx/buildscantailor.sh
@@ -93,8 +93,8 @@ cd $STSRC
 # make clean
 # rm CMakeCache.txt
 # needed in case scantailor source is not updated to compile with new boost (>=1_34) test infrastructure
-[ ! -f $STSRC/imageproc/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/imageproc/tests/main.cpp
-[ ! -f $STSRC/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/tests/main.cpp
+#[ ! -f $STSRC/imageproc/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/imageproc/tests/main.cpp # hardcoded in cpp now [truf]
+#[ ! -f $STSRC/tests/main.cpp.old ] && sed -i '.old' -e '1,$ s%^#include <boost/test/auto_unit_test\.hpp>%#include <boost/test/included/unit_test.hpp>%g' $STSRC/tests/main.cpp #hardcoded in cpp now [truf]
 [ ! -f CMakeCache.txt ] && cmake -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET -DCMAKE_OSX_SYSROOT="$PATH_TO_SDK" -DPNG_INCLUDE_DIR=$BUILDDIR -DCMAKE_PREFIX_PATH=$HOME/Qt/5.5/clang_64/ .
 # I’ve hardcoded path to Qt above [Truf]
 make
diff --git a/packaging/osx/makeapp.sh b/packaging/osx/makeapp.sh
index 259fb25fe..279c5f0cf 100755
--- a/packaging/osx/makeapp.sh
+++ b/packaging/osx/makeapp.sh
@@ -30,7 +30,7 @@ mkdir -p $APPF
 cp $SRCDIR/packaging/osx/ScanTailorUniversal.icns $APPR/ScanTailorUniversal.icns
 cp $SRCDIR/scantailor_*.qm $APPR
 cp $SRCDIR/translations/qtbase_*.qm $APPR
-cp $SRCDIR/scantailor $APPM/ScanTailorUniversal
+cp $SRCDIR/scantailor.app/Contents/MacOS/scantailor $APPM/ScanTailorUniversal
 
 stver=`cat $SRCDIR/version.h | grep 'VERSION "' | cut -d ' ' -f 3 | tr -d '"'`
 cat $SRCDIR/packaging/osx/Info.plist.in | sed "s/@VERSION@/$stver/" >  $APPC/Info.plist
diff --git a/tests/main.cpp b/tests/main.cpp
index 8138ef7fb..4bdcc20ec 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -22,4 +22,4 @@
 
 #define BOOST_AUTO_TEST_MAIN
 
-#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/included/unit_test.hpp>