diff --git a/.gitattributes b/.gitattributes
index e77c524ca1ff06ae2ae2a8458967162d231c4868..4dd0d0e6a2718a110f56ea137dc3ecbb86c1fdfa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4828,6 +4828,7 @@ SAS/OTDB_Services/test/CMakeLists.txt -text
 SAS/OTDB_Services/test/t_TreeService.py -text
 SAS/OTDB_Services/test/t_TreeService.run -text svneol=unset#application/x-shellscript
 SAS/OTDB_Services/test/t_TreeService.sh -text svneol=unset#application/x-shellscript
+SAS/OTDB_Services/test/unittest_db.dump.gz -text svneol=unset#application/x-gzip
 SAS/Scheduler/src/.default_settings.set -text
 SAS/Scheduler/src/LOFAR_libScheduler.pro -text
 SAS/Scheduler/src/conflictdialog.ui -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 1e2efe49f3fc4aab51141a21b84b52c770b9dc87..d6d9f6bcd1e2e07c194a6aa3c30a126e1f74e81c 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -132,6 +132,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(CobaltTest_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/CobaltTest)
   set(BrokenAntennaInfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Cobalt/BrokenAntennaInfo)
   set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
+  set(OTDB_Services_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB_Services)
   set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
   set(OTDB_SQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB/sql)
   set(Scheduler_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Scheduler)
diff --git a/SAS/OTDB_Services/CMakeLists.txt b/SAS/OTDB_Services/CMakeLists.txt
index 55b43af61929b13024d13bd22ebd417f7e2eb4da..4c6ee650e826b7185f0c7b77ef3b3fe18a777ee5 100644
--- a/SAS/OTDB_Services/CMakeLists.txt
+++ b/SAS/OTDB_Services/CMakeLists.txt
@@ -4,13 +4,11 @@
 
 include(PythonInstall)
 
-set(_py_files
-  __init__.py
+lofar_add_bin_scripts(
   TreeService.py
   TreeStatusEvents.py
 )
 
-python_install(${_py_files} DESTINATION bin)
 
 add_subdirectory(test)
 
diff --git a/SAS/OTDB_Services/TreeService.py b/SAS/OTDB_Services/TreeService.py
index b389652a91cbcef2489afdf1e3238f92416a3501..626df85e385c1702edaaa30b4e9de6379ff44e39 100644
--- a/SAS/OTDB_Services/TreeService.py
+++ b/SAS/OTDB_Services/TreeService.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #coding: iso-8859-15
 #
 # Copyright (C) 2015
diff --git a/SAS/OTDB_Services/test/t_TreeService.py b/SAS/OTDB_Services/test/t_TreeService.py
index c5c882f7ab7c186b2b1ddbb1b80dadd6f3a336f0..c98b981f95ac10e8361024b3d7981a17ece44e3f 100644
--- a/SAS/OTDB_Services/test/t_TreeService.py
+++ b/SAS/OTDB_Services/test/t_TreeService.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #coding: iso-8859-15
 #
 # Copyright (C) 2015
diff --git a/SAS/OTDB_Services/test/t_TreeService.run b/SAS/OTDB_Services/test/t_TreeService.run
index 6c7e1d2f03c2aca51eec482c560ff5cb57958db2..37a63124c93466758d77378bdd874591bcef92a4 100755
--- a/SAS/OTDB_Services/test/t_TreeService.run
+++ b/SAS/OTDB_Services/test/t_TreeService.run
@@ -13,9 +13,8 @@ qpid-config add exchange topic $queue
 
 # Setup a clean database with predefined content
 dropdb -U postgres -h ${DBHOST} unittest_db
-createdb -U postgres -h ${DBHOST} unittest_db
-psql -U postgres -h ${DBHOST} -f $src_dir/unittest_db.dump
-python TreeService.py $queue -D unittest_db -H ${DBHOST} &
+gzip -dc $srcdir/unittest_db.dump.gz | psql -U postgres -h ${DBHOST} -f -
+TreeService.py $queue -D unittest_db -H ${DBHOST} &
 SERVER_PID=$!
 # Starting up takes a while
 sleep 3
diff --git a/SAS/OTDB_Services/test/unittest_db.dump.gz b/SAS/OTDB_Services/test/unittest_db.dump.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b0320fb84f5f3d3ab2febf76c4fe591c7d92397f
Binary files /dev/null and b/SAS/OTDB_Services/test/unittest_db.dump.gz differ