Move tests that only need src/lib into test/lib.

160 files changed, 363 insertions, 324 deletions

diff --git a/run/tests b/run/tests
index 520d5dbaf..67b190661 100755
--- a/run/tests
+++ b/run/tests
@@ -62,8 +62,8 @@ if [ "$(uname)" == "Linux" ]; then
     cp -r ../libdcp/xsd build/test
     cp ../libdcp/ratings build/test
     # This must be our patched openssl or tests will fail
-    if [ ! -f build/test/dcpomatic2_openssl ]; then
-        ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl
+    if [ ! -f build/test/lib/dcpomatic2_openssl ]; then
+        ln -s ../../../../openssl/apps/openssl build/test/lib/dcpomatic2_openssl
     fi
     export DCPOMATIC_TEST_TOOLS_PATH=/opt/asdcplib/bin
     if [ -f /src/backports/dcp_inspect ]; then
@@ -107,7 +107,7 @@ if [ "$check" == "1" ]; then
 fi
 
 if [ "$type" == "debug" ]; then
-    gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
+    gdb --args build/test/lib/unit-tests --catch_system_errors=no --log_level=test_suite $*
 elif [ "$type" == "backtrace" ]; then
     gdb -batch -ex "run" -ex "thread apply all bt" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
 elif [ "$type" == "valgrind" ]; then
@@ -123,5 +123,5 @@ elif [ "$type" == "helgrind" ]; then
     valgrind --tool="helgrind" build/test/unit-tests $*
 else
     ulimit -c unlimited
-    build/test/unit-tests --catch_system_errors=no $*
+    build/test/lib/unit-tests --catch_system_errors=no $*
 fi
diff --git a/run/tests.bat b/run/tests.bat
index 3eb422d7d..4ef6e8ab6 100644
--- a/run/tests.bat
+++ b/run/tests.bat
@@ -4,4 +4,4 @@ xcopy ..\libdcp\tags build\test\tags\
 copy ..\libdcp\ratings build\test\
 copy ..\openssl\apps\openssl.exe build\test\
 copy fonts\fonts.conf.windows fonts\fonts.conf
-build\test\unit-tests.exe --log_level=test_suite %1 %2
+build\test\lib\unit-tests.exe --log_level=test_suite %1 %2
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index ccd78a3b1..01b37fa94 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -100,7 +100,7 @@ boost::filesystem::path
 libdcp_resources_path ()
 {
 	if (running_tests) {
-		return directory_containing_executable();
+		return directory_containing_executable().parent_path();
 	}
 
 	if (auto appdir = getenv("APPDIR")) {
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 7d03ce1b3..fc06c8735 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -101,7 +101,7 @@ boost::filesystem::path
 libdcp_resources_path()
 {
 	if (running_tests) {
-		return directory_containing_executable();
+		return directory_containing_executable().parent_path();
 	} else {
 		return resources_path();
 	}
@@ -135,7 +135,12 @@ mount_info()
 boost::filesystem::path
 openssl_path()
 {
-	return directory_containing_executable() / "openssl";
+	if (running_tests) {
+		return directory_containing_executable().parent_path() / "openssl";
+	} else {
+		return directory_containing_executable() / "openssl";
+	}
+
 }
 
 
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index 3fdaad61a..26d1fda53 100644
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -230,7 +230,7 @@ boost::filesystem::path
 libdcp_resources_path()
 {
 	if (running_tests) {
-		return directory_containing_executable();
+		return directory_containing_executable().parent_path();
 	} else {
 		return resources_path();
 	}
@@ -240,7 +240,11 @@ libdcp_resources_path()
 boost::filesystem::path
 openssl_path()
 {
-	return directory_containing_executable() / "openssl.exe";
+	if (running_tests) {
+		return directory_containing_executable().parent_path() / "openssl.exe";
+	} else {
+		return directory_containing_executable() / "openssl.exe";
+	}
 }
 
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 5ac75134d..97928dc15 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1048,7 +1048,7 @@ boost::filesystem::path
 default_font_file()
 {
 	if (running_tests) {
-		auto const liberation = directory_containing_executable().parent_path().parent_path() / "fonts" / "LiberationSans-Regular.ttf";
+		auto const liberation = directory_containing_executable().parent_path().parent_path().parent_path() / "fonts" / "LiberationSans-Regular.ttf";
 		DCPOMATIC_ASSERT(dcp::filesystem::exists(liberation));
 		return liberation;
 	}
diff --git a/test/2536_regression_test.cc b/test/lib/2536_regression_test.cc
index 955487724..b5a956208 100644
--- a/test/2536_regression_test.cc
+++ b/test/lib/2536_regression_test.cc
@@ -25,7 +25,7 @@
 #include "lib/image.h"
 #include "lib/player.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/2986_regression_test.cc b/test/lib/2986_regression_test.cc
index 29aabf8ad..0d66b9d94 100644
--- a/test/2986_regression_test.cc
+++ b/test/lib/2986_regression_test.cc
@@ -25,7 +25,7 @@
 #include "lib/font.h"
 #include "lib/player.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/4k_test.cc b/test/lib/4k_test.cc
index a1b9477b1..fd37d76da 100644
--- a/test/4k_test.cc
+++ b/test/lib/4k_test.cc
@@ -35,7 +35,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/analytics_test.cc b/test/lib/analytics_test.cc
index 1404738e1..4a3bdf066 100644
--- a/test/analytics_test.cc
+++ b/test/lib/analytics_test.cc
@@ -20,7 +20,7 @@
 
 
 #include "lib/analytics.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/filesystem.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/atmos_test.cc b/test/lib/atmos_test.cc
index 33a427321..5bd57ee7d 100644
--- a/test/atmos_test.cc
+++ b/test/lib/atmos_test.cc
@@ -24,7 +24,7 @@
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/atmos_asset.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/test/audio_analysis_test.cc b/test/lib/audio_analysis_test.cc
index 41f0abead..201f3464e 100644
--- a/test/audio_analysis_test.cc
+++ b/test/lib/audio_analysis_test.cc
@@ -39,7 +39,7 @@
 #include "lib/job_manager.h"
 #include "lib/playlist.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <numeric>
 
diff --git a/test/audio_buffers_test.cc b/test/lib/audio_buffers_test.cc
index 49df09646..49df09646 100644
--- a/test/audio_buffers_test.cc
+++ b/test/lib/audio_buffers_test.cc
diff --git a/test/audio_content_test.cc b/test/lib/audio_content_test.cc
index cc9fad712..8c4dafd39 100644
--- a/test/audio_content_test.cc
+++ b/test/lib/audio_content_test.cc
@@ -25,7 +25,7 @@
 #include "lib/film.h"
 #include "lib/maths_util.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_reader.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/audio_delay_test.cc b/test/lib/audio_delay_test.cc
index 369881d71..96ea86f8f 100644
--- a/test/audio_delay_test.cc
+++ b/test/lib/audio_delay_test.cc
@@ -34,7 +34,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_sound_asset.h>
diff --git a/test/audio_filter_test.cc b/test/lib/audio_filter_test.cc
index b5ac25af7..b5ac25af7 100644
--- a/test/audio_filter_test.cc
+++ b/test/lib/audio_filter_test.cc
diff --git a/test/audio_mapping_test.cc b/test/lib/audio_mapping_test.cc
index 22412b260..22412b260 100644
--- a/test/audio_mapping_test.cc
+++ b/test/lib/audio_mapping_test.cc
diff --git a/test/audio_merger_test.cc b/test/lib/audio_merger_test.cc
index b08d9c9f5..bda141ef9 100644
--- a/test/audio_merger_test.cc
+++ b/test/lib/audio_merger_test.cc
@@ -29,7 +29,7 @@
 #include "lib/audio_merger.h"
 #include "lib/audio_buffers.h"
 #include "lib/dcpomatic_time.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/file.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/audio_processor_delay_test.cc b/test/lib/audio_processor_delay_test.cc
index 90c8c1897..90c8c1897 100644
--- a/test/audio_processor_delay_test.cc
+++ b/test/lib/audio_processor_delay_test.cc
diff --git a/test/audio_processor_test.cc b/test/lib/audio_processor_test.cc
index 8ec829bf1..79b7c9e62 100644
--- a/test/audio_processor_test.cc
+++ b/test/lib/audio_processor_test.cc
@@ -31,7 +31,7 @@
 #include "lib/job_manager.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/audio_ring_buffers_test.cc b/test/lib/audio_ring_buffers_test.cc
index 265142d53..265142d53 100644
--- a/test/audio_ring_buffers_test.cc
+++ b/test/lib/audio_ring_buffers_test.cc
diff --git a/test/burnt_subtitle_test.cc b/test/lib/burnt_subtitle_test.cc
index 6b2e64d6a..356c3cd98 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/lib/burnt_subtitle_test.cc
@@ -34,7 +34,7 @@
 #include "lib/log_entry.h"
 #include "lib/ratio.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
diff --git a/test/butler_test.cc b/test/lib/butler_test.cc
index b95aed4df..af18a723f 100644
--- a/test/butler_test.cc
+++ b/test/lib/butler_test.cc
@@ -27,7 +27,7 @@
 #include "lib/film.h"
 #include "lib/player.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/bv20_test.cc b/test/lib/bv20_test.cc
index 796445075..8f9164664 100644
--- a/test/bv20_test.cc
+++ b/test/lib/bv20_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/Metadata.h>
diff --git a/test/cinema_list_test.cc b/test/lib/cinema_list_test.cc
index 15e832eba..519997dc5 100644
--- a/test/cinema_list_test.cc
+++ b/test/lib/cinema_list_test.cc
@@ -23,7 +23,7 @@
 #include "lib/cinema_list.h"
 #include "lib/config.h"
 #include "lib/screen.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/certificate.h>
 #include <dcp/filesystem.h>
 #include <dcp/util.h>
diff --git a/test/cinema_sound_processor_test.cc b/test/lib/cinema_sound_processor_test.cc
index b53917641..b53917641 100644
--- a/test/cinema_sound_processor_test.cc
+++ b/test/lib/cinema_sound_processor_test.cc
diff --git a/test/client_server_test.cc b/test/lib/client_server_test.cc
index 43084bf31..d09f32f47 100644
--- a/test/client_server_test.cc
+++ b/test/lib/client_server_test.cc
@@ -38,7 +38,7 @@
 #include "lib/j2k_image_proxy.h"
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
diff --git a/test/closed_caption_test.cc b/test/lib/closed_caption_test.cc
index c8ef6865d..615aad16a 100644
--- a/test/closed_caption_test.cc
+++ b/test/lib/closed_caption_test.cc
@@ -22,7 +22,7 @@
 #include "lib/film.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/collator_test.cc b/test/lib/collator_test.cc
index 792a11182..792a11182 100644
--- a/test/collator_test.cc
+++ b/test/lib/collator_test.cc
diff --git a/test/colour_conversion_test.cc b/test/lib/colour_conversion_test.cc
index 7b4d1eebd..7b4d1eebd 100644
--- a/test/colour_conversion_test.cc
+++ b/test/lib/colour_conversion_test.cc
diff --git a/test/config_test.cc b/test/lib/config_test.cc
index 8fd19b693..b7acb66e4 100644
--- a/test/config_test.cc
+++ b/test/lib/config_test.cc
@@ -26,7 +26,7 @@
 #include "lib/dkdm_recipient_list.h"
 #include "lib/unzipper.h"
 #include "lib/zipper.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 
diff --git a/test/content_test.cc b/test/lib/content_test.cc
index b9a25a02b..0a276f122 100644
--- a/test/content_test.cc
+++ b/test/lib/content_test.cc
@@ -31,7 +31,7 @@
 #include "lib/content_factory.h"
 #include "lib/content.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/copy_dcp_details_to_film_test.cc b/test/lib/copy_dcp_details_to_film_test.cc
index 6dd913aa0..ffa96e3c5 100644
--- a/test/copy_dcp_details_to_film_test.cc
+++ b/test/lib/copy_dcp_details_to_film_test.cc
@@ -23,7 +23,7 @@
 #include "lib/copy_dcp_details_to_film.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/language_tag.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/cpl_hash_test.cc b/test/lib/cpl_hash_test.cc
index 603fa4b8d..c3f2b119a 100644
--- a/test/cpl_hash_test.cc
+++ b/test/lib/cpl_hash_test.cc
@@ -29,7 +29,7 @@
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/cpl_metadata_test.cc b/test/lib/cpl_metadata_test.cc
index c0a3c658d..9ce14c70e 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/lib/cpl_metadata_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/create_cli_test.cc b/test/lib/create_cli_test.cc
index 1209f9344..2213c2215 100644
--- a/test/create_cli_test.cc
+++ b/test/lib/create_cli_test.cc
@@ -26,7 +26,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <fmt/format.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/tokenizer.hpp>
diff --git a/test/dcp_decoder_test.cc b/test/lib/dcp_decoder_test.cc
index cf8366919..e772f4706 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/lib/dcp_decoder_test.cc
@@ -34,7 +34,7 @@
 #include "lib/job_manager.h"
 #include "lib/piece.h"
 #include "lib/player.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/dcp_digest_file_test.cc b/test/lib/dcp_digest_file_test.cc
index 5c12fbb33..770d198c1 100644
--- a/test/dcp_digest_file_test.cc
+++ b/test/lib/dcp_digest_file_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcp_content.h"
 #include "lib/dcp_digest_file.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/algorithm/string.hpp>
diff --git a/test/dcp_examiner_test.cc b/test/lib/dcp_examiner_test.cc
index 6efbd1bbc..d8fc81d5e 100644
--- a/test/dcp_examiner_test.cc
+++ b/test/lib/dcp_examiner_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcp_examiner.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/dcp_metadata_test.cc b/test/lib/dcp_metadata_test.cc
index f3d912631..05b648bc1 100644
--- a/test/dcp_metadata_test.cc
+++ b/test/lib/dcp_metadata_test.cc
@@ -22,7 +22,7 @@
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/dcp_playback_test.cc b/test/lib/dcp_playback_test.cc
index c63c3c092..2ce763911 100644
--- a/test/dcp_playback_test.cc
+++ b/test/lib/dcp_playback_test.cc
@@ -23,7 +23,7 @@
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/player.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/dcp_subtitle_test.cc b/test/lib/dcp_subtitle_test.cc
index 3888a7b53..7e65b5047 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/lib/dcp_subtitle_test.cc
@@ -36,7 +36,7 @@
 #include "lib/ratio.h"
 #include "lib/text_content.h"
 #include "lib/text_decoder.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/smpte_text_asset.h>
diff --git a/test/dcpomatic_time_test.cc b/test/lib/dcpomatic_time_test.cc
index 5d23f2478..5d23f2478 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/lib/dcpomatic_time_test.cc
diff --git a/test/digest_test.cc b/test/lib/digest_test.cc
index 39737b7f5..6ee829000 100644
--- a/test/digest_test.cc
+++ b/test/lib/digest_test.cc
@@ -30,7 +30,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
 #include "lib/image_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
diff --git a/test/disk_writer_test.cc b/test/lib/disk_writer_test.cc
index 5004df4d5..e28dc1c56 100644
--- a/test/disk_writer_test.cc
+++ b/test/lib/disk_writer_test.cc
@@ -22,7 +22,7 @@
 #include "lib/cross.h"
 #include "lib/ext.h"
 #include "lib/io_context.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
diff --git a/test/dkdm_recipient_list_test.cc b/test/lib/dkdm_recipient_list_test.cc
index 9d4486595..4996de6d2 100644
--- a/test/dkdm_recipient_list_test.cc
+++ b/test/lib/dkdm_recipient_list_test.cc
@@ -22,7 +22,7 @@
 #include "lib/config.h"
 #include "lib/dkdm_recipient.h"
 #include "lib/dkdm_recipient_list.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/filesystem.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/email_test.cc b/test/lib/email_test.cc
index 2402c1d07..56599313f 100644
--- a/test/email_test.cc
+++ b/test/lib/email_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/email.h"
 #include "smtp_server.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
diff --git a/test/empty_caption_test.cc b/test/lib/empty_caption_test.cc
index d9ae4a1c7..f64ca6578 100644
--- a/test/empty_caption_test.cc
+++ b/test/lib/empty_caption_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/empty_test.cc b/test/lib/empty_test.cc
index 922d6a5b1..d3e41068f 100644
--- a/test/empty_test.cc
+++ b/test/lib/empty_test.cc
@@ -33,7 +33,7 @@
 #include "lib/player.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/encode_cli_test.cc b/test/lib/encode_cli_test.cc
index 0a0a17e3a..f607861b2 100644
--- a/test/encode_cli_test.cc
+++ b/test/lib/encode_cli_test.cc
@@ -22,7 +22,7 @@
 #include "lib/content_factory.h"
 #include "lib/encode_cli.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/optional.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
diff --git a/test/encryption_test.cc b/test/lib/encryption_test.cc
index 97359cd44..29cc39a06 100644
--- a/test/encryption_test.cc
+++ b/test/lib/encryption_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcp_content.h"
 #include "lib/dcp_examiner.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/ffmpeg_audio_only_test.cc b/test/lib/ffmpeg_audio_only_test.cc
index 6d43debcf..db62a3a3d 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/lib/ffmpeg_audio_only_test.cc
@@ -31,7 +31,7 @@
 #include "lib/player.h"
 #include "lib/job_manager.h"
 #include "lib/audio_buffers.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_reader.h>
 #include <sndfile.h>
diff --git a/test/ffmpeg_audio_test.cc b/test/lib/ffmpeg_audio_test.cc
index a106b7dde..de377defc 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/lib/ffmpeg_audio_test.cc
@@ -34,7 +34,7 @@
 #include "lib/player.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/sound_asset.h>
diff --git a/test/ffmpeg_dcp_test.cc b/test/lib/ffmpeg_dcp_test.cc
index 96a3618be..62d65f32e 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/lib/ffmpeg_dcp_test.cc
@@ -32,7 +32,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/ffmpeg_decoder_error_test.cc b/test/lib/ffmpeg_decoder_error_test.cc
index 1d3896618..d5293d924 100644
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/lib/ffmpeg_decoder_error_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/film.h"
 #include "lib/player.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/lib/ffmpeg_decoder_seek_test.cc
index 796db043f..18ed19914 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/lib/ffmpeg_decoder_seek_test.cc
@@ -34,7 +34,7 @@
 #include "lib/film.h"
 #include "lib/null_log.h"
 #include "lib/video_decoder.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/lib/ffmpeg_decoder_sequential_test.cc
index 43ef3eb68..479e15c59 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/lib/ffmpeg_decoder_sequential_test.cc
@@ -33,7 +33,7 @@
 #include "lib/film.h"
 #include "lib/player_video.h"
 #include "lib/player.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
diff --git a/test/ffmpeg_encoder_test.cc b/test/lib/ffmpeg_encoder_test.cc
index 0a48cd745..a73436f3a 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/lib/ffmpeg_encoder_test.cc
@@ -37,7 +37,7 @@
 #include "lib/text_content.h"
 #include "lib/transcode_job.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/file.h>
 #include <dcp/raw_convert.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/ffmpeg_examiner_test.cc b/test/lib/ffmpeg_examiner_test.cc
index c07900db8..e9ca32e3a 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/lib/ffmpeg_examiner_test.cc
@@ -25,11 +25,11 @@
  */
 
 
-#include <boost/test/unit_test.hpp>
 #include "lib/ffmpeg_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_audio_stream.h"
-#include "test.h"
+#include "../test.h"
+#include <boost/test/unit_test.hpp>
 
 
 using std::make_shared;
diff --git a/test/ffmpeg_properties_test.cc b/test/lib/ffmpeg_properties_test.cc
index 1e0cdc42f..b3cbb0609 100644
--- a/test/ffmpeg_properties_test.cc
+++ b/test/lib/ffmpeg_properties_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/user_property.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/lib/ffmpeg_pts_offset_test.cc
index 642d85ff2..4f447dc3d 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/lib/ffmpeg_pts_offset_test.cc
@@ -30,7 +30,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/ffmpeg_subtitles_test.cc b/test/lib/ffmpeg_subtitles_test.cc
index b7f81ff41..21ac3a10b 100644
--- a/test/ffmpeg_subtitles_test.cc
+++ b/test/lib/ffmpeg_subtitles_test.cc
@@ -23,7 +23,7 @@
 #include "lib/film.h"
 #include "lib/player.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/optional.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/file_extension_test.cc b/test/lib/file_extension_test.cc
index 99075fd1c..40179121c 100644
--- a/test/file_extension_test.cc
+++ b/test/lib/file_extension_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/file_group_test.cc b/test/lib/file_group_test.cc
index 3fb31317c..3fb31317c 100644
--- a/test/file_group_test.cc
+++ b/test/lib/file_group_test.cc
diff --git a/test/file_log_test.cc b/test/lib/file_log_test.cc
index dca1d4386..dca1d4386 100644
--- a/test/file_log_test.cc
+++ b/test/lib/file_log_test.cc
diff --git a/test/file_naming_test.cc b/test/lib/file_naming_test.cc
index 2953046b5..32374e8ce 100644
--- a/test/file_naming_test.cc
+++ b/test/lib/file_naming_test.cc
@@ -25,13 +25,13 @@
  */
 
 
-#include "test.h"
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/video_content.h"
+#include "../test.h"
 #ifdef DCPOMATIC_WINDOWS
 #include <boost/locale.hpp>
 #endif
diff --git a/test/filename_charset_test.cc b/test/lib/filename_charset_test.cc
index 10afe1f2c..d69c530ec 100644
--- a/test/filename_charset_test.cc
+++ b/test/lib/filename_charset_test.cc
@@ -20,7 +20,7 @@
 
 
 #include "lib/dcp_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/film_metadata_test.cc b/test/lib/film_metadata_test.cc
index b99d1a572..9ec0a8399 100644
--- a/test/film_metadata_test.cc
+++ b/test/lib/film_metadata_test.cc
@@ -33,7 +33,7 @@
 #include "lib/ratio.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/film_test.cc b/test/lib/film_test.cc
index 820c15624..6abce5c77 100644
--- a/test/film_test.cc
+++ b/test/lib/film_test.cc
@@ -23,7 +23,7 @@
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/job_manager.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/find_missing_test.cc b/test/lib/find_missing_test.cc
index f455be19d..b9bef8055 100644
--- a/test/find_missing_test.cc
+++ b/test/lib/find_missing_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/find_missing.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/font_comparator_test.cc b/test/lib/font_comparator_test.cc
index dad058a74..dad058a74 100644
--- a/test/font_comparator_test.cc
+++ b/test/lib/font_comparator_test.cc
diff --git a/test/font_id_allocator_test.cc b/test/lib/font_id_allocator_test.cc
index 19c4a2154..19c4a2154 100644
--- a/test/font_id_allocator_test.cc
+++ b/test/lib/font_id_allocator_test.cc
diff --git a/test/frame_interval_checker_test.cc b/test/lib/frame_interval_checker_test.cc
index 4b92d33d6..4b92d33d6 100644
--- a/test/frame_interval_checker_test.cc
+++ b/test/lib/frame_interval_checker_test.cc
diff --git a/test/frame_rate_test.cc b/test/lib/frame_rate_test.cc
index d87f7bfc5..99db2be68 100644
--- a/test/frame_rate_test.cc
+++ b/test/lib/frame_rate_test.cc
@@ -34,7 +34,7 @@
 #include "lib/frame_rate_change.h"
 #include "lib/playlist.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/grok_util_test.cc b/test/lib/grok_util_test.cc
index 2a84fe2a4..435f3f449 100644
--- a/test/grok_util_test.cc
+++ b/test/lib/grok_util_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/config.h"
 #include "lib/grok/util.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/guess_crop_test.cc b/test/lib/guess_crop_test.cc
index 9ce089a80..bf199dd64 100644
--- a/test/guess_crop_test.cc
+++ b/test/lib/guess_crop_test.cc
@@ -24,7 +24,7 @@
 #include "lib/dcp_content.h"
 #include "lib/guess_crop.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <vector>
 
diff --git a/test/hints_test.cc b/test/lib/hints_test.cc
index 1b510f9e7..14d79c1df 100644
--- a/test/hints_test.cc
+++ b/test/lib/hints_test.cc
@@ -29,7 +29,7 @@
 #include "lib/font.h"
 #include "lib/hints.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/image_content_fade_test.cc b/test/lib/image_content_fade_test.cc
index 5ac63405a..d4de0f7b9 100644
--- a/test/image_content_fade_test.cc
+++ b/test/lib/image_content_fade_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/image_filename_sorter_test.cc b/test/lib/image_filename_sorter_test.cc
index 29b550753..29b550753 100644
--- a/test/image_filename_sorter_test.cc
+++ b/test/lib/image_filename_sorter_test.cc
diff --git a/test/image_proxy_test.cc b/test/lib/image_proxy_test.cc
index 572f31c81..18b8bb366 100644
--- a/test/image_proxy_test.cc
+++ b/test/lib/image_proxy_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/ffmpeg_image_proxy.h"
 #include "lib/j2k_image_proxy.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/image_test.cc b/test/lib/image_test.cc
index 4df4f9125..cd18d479d 100644
--- a/test/image_test.cc
+++ b/test/lib/image_test.cc
@@ -33,7 +33,7 @@
 #include "lib/image_jpeg.h"
 #include "lib/image_png.h"
 #include "lib/ffmpeg_image_proxy.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/test/import_dcp_test.cc b/test/lib/import_dcp_test.cc
index e9f7f068b..6a1448660 100644
--- a/test/import_dcp_test.cc
+++ b/test/lib/import_dcp_test.cc
@@ -39,7 +39,7 @@
 #include "lib/ratio.h"
 #include "lib/screen.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/interrupt_encoder_test.cc b/test/lib/interrupt_encoder_test.cc
index c786a3110..071669a2a 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/lib/interrupt_encoder_test.cc
@@ -33,7 +33,7 @@
 #include "lib/job_manager.h"
 #include "lib/make_dcp.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/isdcf_name_test.cc b/test/lib/isdcf_name_test.cc
index b0cc568cd..c4bbdaf4a 100644
--- a/test/isdcf_name_test.cc
+++ b/test/lib/isdcf_name_test.cc
@@ -35,7 +35,7 @@
 #include "lib/ratio.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/j2k_encode_threading_test.cc b/test/lib/j2k_encode_threading_test.cc
index 58f354e80..5f1178175 100644
--- a/test/j2k_encode_threading_test.cc
+++ b/test/lib/j2k_encode_threading_test.cc
@@ -32,7 +32,7 @@
 #include "lib/job_manager.h"
 #include "lib/make_dcp.h"
 #include "lib/transcode_job.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/j2k_encoder_test.cc b/test/lib/j2k_encoder_test.cc
index 358ccf435..31b055f1d 100644
--- a/test/j2k_encoder_test.cc
+++ b/test/lib/j2k_encoder_test.cc
@@ -26,7 +26,7 @@
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
 #include "lib/writer.h"
-#include "test.h"
+#include "../test.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
diff --git a/test/j2k_video_bit_rate_test.cc b/test/lib/j2k_video_bit_rate_test.cc
index 5ab1880bf..83944f58a 100644
--- a/test/j2k_video_bit_rate_test.cc
+++ b/test/lib/j2k_video_bit_rate_test.cc
@@ -25,11 +25,11 @@
  */
 
 
-#include "test.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
 #include "lib/image_content.h"
 #include "lib/video_content.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <fmt/format.h>
 
diff --git a/test/job_manager_test.cc b/test/lib/job_manager_test.cc
index abbbf5c4b..abbbf5c4b 100644
--- a/test/job_manager_test.cc
+++ b/test/lib/job_manager_test.cc
diff --git a/test/kdm_cli_test.cc b/test/lib/kdm_cli_test.cc
index 85fd61c62..fe2244732 100644
--- a/test/kdm_cli_test.cc
+++ b/test/lib/kdm_cli_test.cc
@@ -29,7 +29,7 @@
 #include "lib/kdm_cli.h"
 #include "lib/screen.h"
 #include "lib/trusted_device.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/kdm_naming_test.cc b/test/lib/kdm_naming_test.cc
index fe7da7f31..cbf151d90 100644
--- a/test/kdm_naming_test.cc
+++ b/test/lib/kdm_naming_test.cc
@@ -26,7 +26,7 @@
 #include "lib/film.h"
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/kdm_util_test.cc b/test/lib/kdm_util_test.cc
index 8426f247a..8426f247a 100644
--- a/test/kdm_util_test.cc
+++ b/test/lib/kdm_util_test.cc
diff --git a/test/low_bitrate_test.cc b/test/lib/low_bitrate_test.cc
index 52b8d54be..52b8d54be 100644
--- a/test/low_bitrate_test.cc
+++ b/test/lib/low_bitrate_test.cc
diff --git a/test/map_cli_test.cc b/test/lib/map_cli_test.cc
index aaf5b944f..b299c7e72 100644
--- a/test/map_cli_test.cc
+++ b/test/lib/map_cli_test.cc
@@ -26,7 +26,7 @@
 #include "lib/film.h"
 #include "lib/map_cli.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/markers_test.cc b/test/lib/markers_test.cc
index f7ff3a6b5..62021242b 100644
--- a/test/markers_test.cc
+++ b/test/lib/markers_test.cc
@@ -27,7 +27,7 @@
 
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel_markers_asset.h>
diff --git a/test/mca_subdescriptors_test.cc b/test/lib/mca_subdescriptors_test.cc
index ad146700e..de035e3c1 100644
--- a/test/mca_subdescriptors_test.cc
+++ b/test/lib/mca_subdescriptors_test.cc
@@ -24,7 +24,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <libcxml/cxml.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/mpeg2_dcp_test.cc b/test/lib/mpeg2_dcp_test.cc
index dd439eac6..d28d7f2df 100644
--- a/test/mpeg2_dcp_test.cc
+++ b/test/lib/mpeg2_dcp_test.cc
@@ -19,11 +19,11 @@
 */
 
 
-#include "test.h"
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/video_encoding.h"
+#include "../test.h"
 #ifdef DCPOMATIC_LINUX
 #include <boost/process.hpp>
 #endif
diff --git a/test/no_use_video_test.cc b/test/lib/no_use_video_test.cc
index 441d64166..ba06cbe10 100644
--- a/test/no_use_video_test.cc
+++ b/test/lib/no_use_video_test.cc
@@ -32,7 +32,7 @@
 #include "lib/film.h"
 #include "lib/dcp_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/open_caption_test.cc b/test/lib/open_caption_test.cc
index d1f173062..62ce89d94 100644
--- a/test/open_caption_test.cc
+++ b/test/lib/open_caption_test.cc
@@ -22,7 +22,7 @@
 
 #include "lib/content_factory.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/optimise_stills_test.cc b/test/lib/optimise_stills_test.cc
index c0049507d..e3df7b36c 100644
--- a/test/optimise_stills_test.cc
+++ b/test/lib/optimise_stills_test.cc
@@ -29,7 +29,7 @@
 #include "lib/transcode_job.h"
 #include "lib/video_content.h"
 #include "lib/writer.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/overlap_video_test.cc b/test/lib/overlap_video_test.cc
index 33a0bf8bd..4b195862c 100644
--- a/test/overlap_video_test.cc
+++ b/test/lib/overlap_video_test.cc
@@ -26,7 +26,7 @@
 #include "lib/piece.h"
 #include "lib/player.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/j2k_transcode.h>
diff --git a/test/pixel_formats_test.cc b/test/lib/pixel_formats_test.cc
index 12a95bd69..12a95bd69 100644
--- a/test/pixel_formats_test.cc
+++ b/test/lib/pixel_formats_test.cc
diff --git a/test/player_test.cc b/test/lib/player_test.cc
index 60b365eb1..a61015a81 100644
--- a/test/player_test.cc
+++ b/test/lib/player_test.cc
@@ -45,7 +45,7 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
diff --git a/test/playlist_test.cc b/test/lib/playlist_test.cc
index e279e9cc8..949d7e043 100644
--- a/test/playlist_test.cc
+++ b/test/lib/playlist_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/pulldown_detect_test.cc b/test/lib/pulldown_detect_test.cc
index 9830d12cd..d3a7e5ed7 100644
--- a/test/pulldown_detect_test.cc
+++ b/test/lib/pulldown_detect_test.cc
@@ -22,7 +22,7 @@
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/ratio_test.cc b/test/lib/ratio_test.cc
index a21859049..c1450e0e9 100644
--- a/test/ratio_test.cc
+++ b/test/lib/ratio_test.cc
@@ -28,7 +28,7 @@
 #include <dcp/util.h>
 #include "lib/ratio.h"
 #include "lib/util.h"
-#include "test.h"
+#include "../test.h"
 
 using std::ostream;
 
diff --git a/test/recover_test.cc b/test/lib/recover_test.cc
index ba06fcde9..d2d23bbbf 100644
--- a/test/recover_test.cc
+++ b/test/lib/recover_test.cc
@@ -25,13 +25,13 @@
  */
 
 
-#include "test.h"
-#include "lib/film.h"
 #include "lib/dcp_content_type.h"
-#include "lib/image_content.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/video_content.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
+#include "../test.h"
 #include <dcp/equality_options.h>
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/stereo_j2k_picture_asset.h>
diff --git a/test/rect_test.cc b/test/lib/rect_test.cc
index 24df33316..24df33316 100644
--- a/test/rect_test.cc
+++ b/test/lib/rect_test.cc
diff --git a/test/reel_writer_test.cc b/test/lib/reel_writer_test.cc
index cb5ad349e..876d3ab8d 100644
--- a/test/reel_writer_test.cc
+++ b/test/lib/reel_writer_test.cc
@@ -33,7 +33,7 @@
 #include "lib/frame_info.h"
 #include "lib/reel_writer.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
diff --git a/test/reels_test.cc b/test/lib/reels_test.cc
index b79bd4e17..bb2215244 100644
--- a/test/reels_test.cc
+++ b/test/lib/reels_test.cc
@@ -36,7 +36,7 @@
 #include "lib/string_text_file_content.h"
 #include "lib/variant.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
diff --git a/test/relative_paths_test.cc b/test/lib/relative_paths_test.cc
index 6028c1435..9aaf965a8 100644
--- a/test/relative_paths_test.cc
+++ b/test/lib/relative_paths_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/config.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/release_notes_test.cc b/test/lib/release_notes_test.cc
index addcc9f85..addcc9f85 100644
--- a/test/release_notes_test.cc
+++ b/test/lib/release_notes_test.cc
diff --git a/test/remake_id_test.cc b/test/lib/remake_id_test.cc
index 84937c3ab..a3bc04eea 100644
--- a/test/remake_id_test.cc
+++ b/test/lib/remake_id_test.cc
@@ -27,7 +27,7 @@
 #include "lib/film.h"
 #include "lib/job_manager.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
diff --git a/test/remake_video_test.cc b/test/lib/remake_video_test.cc
index 5ad9f1a5e..c91d0a310 100644
--- a/test/remake_video_test.cc
+++ b/test/lib/remake_video_test.cc
@@ -22,7 +22,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/colour_conversion.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/test/remake_with_subtitle_test.cc b/test/lib/remake_with_subtitle_test.cc
index c46a4f70d..237003b59 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/lib/remake_with_subtitle_test.cc
@@ -23,7 +23,7 @@
 #include "lib/content_factory.h"
 #include "lib/text_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/render_subtitles_test.cc b/test/lib/render_subtitles_test.cc
index 1fe43c6d8..93251e29d 100644
--- a/test/render_subtitles_test.cc
+++ b/test/lib/render_subtitles_test.cc
@@ -29,7 +29,7 @@
 #include "lib/image_png.h"
 #include "lib/render_text.h"
 #include "lib/string_text.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/text_string.h>
 #include <pango/pango-utils.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/repeat_frame_test.cc b/test/lib/repeat_frame_test.cc
index 3baed100d..731b1aadb 100644
--- a/test/repeat_frame_test.cc
+++ b/test/lib/repeat_frame_test.cc
@@ -28,13 +28,13 @@
  */
 
 
-#include <boost/test/unit_test.hpp>
-#include "test.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
-#include "lib/ffmpeg_content.h"
-#include "lib/dcp_content_type.h"
 #include "lib/video_content.h"
+#include "../test.h"
+#include <boost/test/unit_test.hpp>
 
 
 using std::make_shared;
diff --git a/test/required_disk_space_test.cc b/test/lib/required_disk_space_test.cc
index 4148126cf..b7ee84e1a 100644
--- a/test/required_disk_space_test.cc
+++ b/test/lib/required_disk_space_test.cc
@@ -28,7 +28,7 @@
 #include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/resampler_test.cc b/test/lib/resampler_test.cc
index 3bab146da..3bab146da 100644
--- a/test/resampler_test.cc
+++ b/test/lib/resampler_test.cc
diff --git a/test/scaling_test.cc b/test/lib/scaling_test.cc
index 69e81cc69..04b666680 100644
--- a/test/scaling_test.cc
+++ b/test/lib/scaling_test.cc
@@ -31,7 +31,7 @@
 #include "lib/image_content.h"
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/scoped_temporary_test.cc b/test/lib/scoped_temporary_test.cc
index 714dab3fc..714dab3fc 100644
--- a/test/scoped_temporary_test.cc
+++ b/test/lib/scoped_temporary_test.cc
diff --git a/test/shuffler_test.cc b/test/lib/shuffler_test.cc
index 37d6749c3..37d6749c3 100644
--- a/test/shuffler_test.cc
+++ b/test/lib/shuffler_test.cc
diff --git a/test/silence_padding_test.cc b/test/lib/silence_padding_test.cc
index a927510fb..4155ff5c3 100644
--- a/test/silence_padding_test.cc
+++ b/test/lib/silence_padding_test.cc
@@ -30,7 +30,7 @@
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/sound_asset.h>
diff --git a/test/skip_frame_test.cc b/test/lib/skip_frame_test.cc
index 6eafd064f..7eef2f1b5 100644
--- a/test/skip_frame_test.cc
+++ b/test/lib/skip_frame_test.cc
@@ -29,7 +29,7 @@
 
 
 #include <boost/test/unit_test.hpp>
-#include "test.h"
+#include "../test.h"
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
diff --git a/test/smtp_server.cc b/test/lib/smtp_server.cc
index c6802bded..c6802bded 100644
--- a/test/smtp_server.cc
+++ b/test/lib/smtp_server.cc
diff --git a/test/smtp_server.h b/test/lib/smtp_server.h
index f3cc1d0a9..f3cc1d0a9 100644
--- a/test/smtp_server.h
+++ b/test/lib/smtp_server.h
diff --git a/test/socket_test.cc b/test/lib/socket_test.cc
index b85f7b0cb..b85f7b0cb 100644
--- a/test/socket_test.cc
+++ b/test/lib/socket_test.cc
diff --git a/test/srt_subtitle_test.cc b/test/lib/srt_subtitle_test.cc
index 7af5426dc..bb74d77f3 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/lib/srt_subtitle_test.cc
@@ -31,7 +31,7 @@
 #include "lib/ratio.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/smpte_text_asset.h>
 #include <dcp/text_string.h>
 #include <boost/algorithm/string.hpp>
diff --git a/test/ssa_subtitle_test.cc b/test/lib/ssa_subtitle_test.cc
index d21f7c450..db0759f36 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/lib/ssa_subtitle_test.cc
@@ -31,7 +31,7 @@
 #include "lib/ratio.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/equality_options.h>
 #include <dcp/interop_text_asset.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/stream_test.cc b/test/lib/stream_test.cc
index ecd2deac8..ecd2deac8 100644
--- a/test/stream_test.cc
+++ b/test/lib/stream_test.cc
diff --git a/test/subtitle_charset_test.cc b/test/lib/subtitle_charset_test.cc
index f4324a646..9800e86f2 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/lib/subtitle_charset_test.cc
@@ -24,7 +24,7 @@
 #include "lib/film.h"
 #include "lib/string_text_file.h"
 #include "lib/string_text_file_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/subtitle_font_id_change_test.cc b/test/lib/subtitle_font_id_change_test.cc
index 9d5f9020f..b8e6f6ac5 100644
--- a/test/subtitle_font_id_change_test.cc
+++ b/test/lib/subtitle_font_id_change_test.cc
@@ -29,7 +29,7 @@
 #include "lib/film.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/verify.h>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/subtitle_font_id_test.cc b/test/lib/subtitle_font_id_test.cc
index 4c0204b69..e90429fbe 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/lib/subtitle_font_id_test.cc
@@ -32,7 +32,7 @@
 #include <dcp/reel.h>
 #include <dcp/reel_text_asset.h>
 #include <dcp/smpte_text_asset.h>
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/subtitle_language_test.cc b/test/lib/subtitle_language_test.cc
index 789412912..612ec4af8 100644
--- a/test/subtitle_language_test.cc
+++ b/test/lib/subtitle_language_test.cc
@@ -28,7 +28,7 @@
 #include "lib/content_factory.h"
 #include "lib/film.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/language_tag.h>
 #include <boost/test/unit_test.hpp>
 #include <vector>
diff --git a/test/subtitle_metadata_test.cc b/test/lib/subtitle_metadata_test.cc
index fcea278d7..412320122 100644
--- a/test/subtitle_metadata_test.cc
+++ b/test/lib/subtitle_metadata_test.cc
@@ -25,7 +25,7 @@
 
 
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/subtitle_position_test.cc b/test/lib/subtitle_position_test.cc
index 05e305478..2dda73945 100644
--- a/test/subtitle_position_test.cc
+++ b/test/lib/subtitle_position_test.cc
@@ -24,7 +24,7 @@
 #include "lib/film.h"
 #include "lib/make_dcp.h"
 #include "lib/text_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/interop_text_asset.h>
 #include <dcp/language_tag.h>
 #include <dcp/smpte_text_asset.h>
diff --git a/test/subtitle_reel_number_test.cc b/test/lib/subtitle_reel_number_test.cc
index caa3cb2fe..7badb217e 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/lib/subtitle_reel_number_test.cc
@@ -24,7 +24,7 @@
 #include "lib/ratio.h"
 #include "lib/text_content.h"
 #include "lib/dcp_content_type.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/subtitle_reel_test.cc b/test/lib/subtitle_reel_test.cc
index a9fa2915d..b0b185392 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/lib/subtitle_reel_test.cc
@@ -24,7 +24,7 @@
 #include "lib/image_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/interop_text_asset.h>
diff --git a/test/subtitle_timing_test.cc b/test/lib/subtitle_timing_test.cc
index 0bb678655..bd2a878bc 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/lib/subtitle_timing_test.cc
@@ -29,7 +29,7 @@
 #include "lib/text_content.h"
 #include "lib/text_decoder.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/subtitle_trim_test.cc b/test/lib/subtitle_trim_test.cc
index 752d14d9b..587300426 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/lib/subtitle_trim_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/template_test.cc b/test/lib/template_test.cc
index 064a070c1..3d0dbff15 100644
--- a/test/template_test.cc
+++ b/test/lib/template_test.cc
@@ -23,7 +23,7 @@
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/film.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/text_decoder_test.cc b/test/lib/text_decoder_test.cc
index d6cbd4ce1..d6cbd4ce1 100644
--- a/test/text_decoder_test.cc
+++ b/test/lib/text_decoder_test.cc
diff --git a/test/text_entry_point_test.cc b/test/lib/text_entry_point_test.cc
index f748a2680..9da6cb36e 100644
--- a/test/text_entry_point_test.cc
+++ b/test/lib/text_entry_point_test.cc
@@ -19,9 +19,9 @@
 */
 
 
-#include "test.h"
 #include "lib/dcp_content.h"
 #include "lib/film.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
diff --git a/test/threed_test.cc b/test/lib/threed_test.cc
index 0df7d9d20..83bfc46b9 100644
--- a/test/threed_test.cc
+++ b/test/lib/threed_test.cc
@@ -41,7 +41,7 @@
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/time_calculation_test.cc b/test/lib/time_calculation_test.cc
index 386e50e25..a136fe848 100644
--- a/test/time_calculation_test.cc
+++ b/test/lib/time_calculation_test.cc
@@ -30,7 +30,7 @@
 #include "lib/video_content.h"
 #include "lib/player.h"
 #include "lib/audio_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/torture_test.cc b/test/lib/torture_test.cc
index e2325955b..7abbaa04b 100644
--- a/test/torture_test.cc
+++ b/test/lib/torture_test.cc
@@ -33,7 +33,7 @@
 #include "lib/ratio.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/mono_j2k_picture_frame.h>
diff --git a/test/unzipper_test.cc b/test/lib/unzipper_test.cc
index f78f15c3f..88aec7baf 100644
--- a/test/unzipper_test.cc
+++ b/test/lib/unzipper_test.cc
@@ -28,7 +28,7 @@
 #include "lib/exceptions.h"
 #include "lib/unzipper.h"
 #include "lib/zipper.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/filesystem.h>
 #include <dcp/util.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/update_checker_test.cc b/test/lib/update_checker_test.cc
index 27754f0dd..27754f0dd 100644
--- a/test/update_checker_test.cc
+++ b/test/lib/update_checker_test.cc
diff --git a/test/upmixer_a_test.cc b/test/lib/upmixer_a_test.cc
index 4ab40563a..ab127a0ac 100644
--- a/test/upmixer_a_test.cc
+++ b/test/lib/upmixer_a_test.cc
@@ -32,7 +32,7 @@
 #include "lib/player.h"
 #include "lib/ratio.h"
 #include "lib/upmixer_a.h"
-#include "test.h"
+#include "../test.h"
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/util_test.cc b/test/lib/util_test.cc
index 5273aa323..6d8f1b5c0 100644
--- a/test/util_test.cc
+++ b/test/lib/util_test.cc
@@ -28,7 +28,7 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/certificate_chain.h>
 #include <fmt/format.h>
 #include <boost/bind/bind.hpp>
diff --git a/test/vf_kdm_test.cc b/test/lib/vf_kdm_test.cc
index 3fd8bc327..b9357cd26 100644
--- a/test/vf_kdm_test.cc
+++ b/test/lib/vf_kdm_test.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "test.h"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/cross.h"
@@ -36,6 +35,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/screen.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/vf_test.cc b/test/lib/vf_test.cc
index a0c48c5a6..793bdc413 100644
--- a/test/vf_test.cc
+++ b/test/lib/vf_test.cc
@@ -38,7 +38,7 @@
 #include "lib/text_content.h"
 #include "lib/referenced_reel_asset.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/j2k_picture_asset_writer.h>
diff --git a/test/video_content_scale_test.cc b/test/lib/video_content_scale_test.cc
index c82392f81..ed47e81bb 100644
--- a/test/video_content_scale_test.cc
+++ b/test/lib/video_content_scale_test.cc
@@ -21,7 +21,7 @@
 
 #include "lib/ratio.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/video_content_test.cc b/test/lib/video_content_test.cc
index ab5f38b77..5458bea3f 100644
--- a/test/video_content_test.cc
+++ b/test/lib/video_content_test.cc
@@ -22,7 +22,7 @@
 #include "lib/content_factory.h"
 #include "lib/dcpomatic_time.h"
 #include "lib/video_content.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/video_level_test.cc b/test/lib/video_level_test.cc
index 91deb9b9b..dc6c815c9 100644
--- a/test/video_level_test.cc
+++ b/test/lib/video_level_test.cc
@@ -42,7 +42,7 @@
 #include "lib/player_video.h"
 #include "lib/transcode_job.h"
 #include "lib/video_decoder.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/mono_j2k_picture_asset.h>
diff --git a/test/video_mxf_content_test.cc b/test/lib/video_mxf_content_test.cc
index df83db41c..af5e7c621 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/lib/video_mxf_content_test.cc
@@ -31,7 +31,7 @@
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/video_mxf_content.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/equality_options.h>
 #include <dcp/mono_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/video_trim_test.cc b/test/lib/video_trim_test.cc
index 067e81eaf..8952d0cd5 100644
--- a/test/video_trim_test.cc
+++ b/test/lib/video_trim_test.cc
@@ -24,7 +24,7 @@
 #include "lib/image_png.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
-#include "test.h"
+#include "../test.h"
 #include <boost/test/unit_test.hpp>
 
 
diff --git a/test/writer_test.cc b/test/lib/writer_test.cc
index b4ef93c1d..36f319f9e 100644
--- a/test/writer_test.cc
+++ b/test/lib/writer_test.cc
@@ -28,7 +28,7 @@
 #include "lib/job.h"
 #include "lib/video_content.h"
 #include "lib/writer.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/j2k_transcode.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/lib/wscript b/test/lib/wscript
new file mode 100644
index 000000000..d9b6876a8
--- /dev/null
+++ b/test/lib/wscript
@@ -0,0 +1,207 @@
+#
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of DCP-o-matic.
+#
+#    DCP-o-matic is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    DCP-o-matic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+def configure(conf):
+    boost_test_suffix=''
+    if conf.env.TARGET_WINDOWS_64:
+        boost_test_suffix='-mt-x64'
+    elif conf.env.TARGET_WINDOWS_32:
+        boost_test_suffix='-mt-x32'
+
+    conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
+
+    conf.check_cxx(fragment="""
+                            #define BOOST_TEST_MODULE Config test\n
+                            #include <boost/test/unit_test.hpp>\n
+                            int main() {}
+                            """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
+
+def build(bld):
+    obj = bld(features='cxx cxxprogram')
+    obj.name   = 'unit-tests'
+    obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG JPEG '
+    obj.uselib += 'LEQM_NRT ZIP SQLITE3 '
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
+        obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
+    if bld.env.TARGET_LINUX:
+        obj.uselib += 'DL '
+    obj.use    = 'libdcpomatic2'
+    obj.source = """
+                 2536_regression_test.cc
+                 2986_regression_test.cc
+                 4k_test.cc
+                 analytics_test.cc
+                 atmos_test.cc
+                 audio_analysis_test.cc
+                 audio_buffers_test.cc
+                 audio_content_test.cc
+                 audio_delay_test.cc
+                 audio_filter_test.cc
+                 audio_mapping_test.cc
+                 audio_merger_test.cc
+                 audio_processor_test.cc
+                 audio_processor_delay_test.cc
+                 audio_ring_buffers_test.cc
+                 burnt_subtitle_test.cc
+                 butler_test.cc
+                 bv20_test.cc
+                 cinema_list_test.cc
+                 cinema_sound_processor_test.cc
+                 client_server_test.cc
+                 closed_caption_test.cc
+                 collator_test.cc
+                 colour_conversion_test.cc
+                 config_test.cc
+                 content_test.cc
+                 copy_dcp_details_to_film_test.cc
+                 cpl_hash_test.cc
+                 cpl_metadata_test.cc
+                 create_cli_test.cc
+                 dcpomatic_time_test.cc
+                 dcp_decoder_test.cc
+                 dcp_digest_file_test.cc
+                 dcp_examiner_test.cc
+                 dcp_metadata_test.cc
+                 dcp_playback_test.cc
+                 dcp_subtitle_test.cc
+                 digest_test.cc
+                 dkdm_recipient_list_test.cc
+                 email_test.cc
+                 empty_caption_test.cc
+                 empty_test.cc
+                 encode_cli_test.cc
+                 encryption_test.cc
+                 file_extension_test.cc
+                 ffmpeg_audio_only_test.cc
+                 ffmpeg_audio_test.cc
+                 ffmpeg_dcp_test.cc
+                 ffmpeg_decoder_error_test.cc
+                 ffmpeg_decoder_seek_test.cc
+                 ffmpeg_decoder_sequential_test.cc
+                 ffmpeg_encoder_test.cc
+                 ffmpeg_examiner_test.cc
+                 ffmpeg_properties_test.cc
+                 ffmpeg_pts_offset_test.cc
+                 ffmpeg_subtitles_test.cc
+                 file_group_test.cc
+                 file_log_test.cc
+                 file_naming_test.cc
+                 filename_charset_test.cc
+                 film_test.cc
+                 film_metadata_test.cc
+                 find_missing_test.cc
+                 font_comparator_test.cc
+                 font_id_allocator_test.cc
+                 frame_interval_checker_test.cc
+                 frame_rate_test.cc
+                 grok_util_test.cc
+                 guess_crop_test.cc
+                 hints_test.cc
+                 image_content_fade_test.cc
+                 image_filename_sorter_test.cc
+                 image_test.cc
+                 image_proxy_test.cc
+                 import_dcp_test.cc
+                 interrupt_encoder_test.cc
+                 isdcf_name_test.cc
+                 j2k_encode_threading_test.cc
+                 j2k_encoder_test.cc
+                 job_manager_test.cc
+                 j2k_video_bit_rate_test.cc
+                 kdm_cli_test.cc
+                 kdm_naming_test.cc
+                 kdm_util_test.cc
+                 low_bitrate_test.cc
+                 markers_test.cc
+                 map_cli_test.cc
+                 mca_subdescriptors_test.cc
+                 mpeg2_dcp_test.cc
+                 no_use_video_test.cc
+                 open_caption_test.cc
+                 optimise_stills_test.cc
+                 overlap_video_test.cc
+                 pixel_formats_test.cc
+                 player_test.cc
+                 playlist_test.cc
+                 pulldown_detect_test.cc
+                 ratio_test.cc
+                 relative_paths_test.cc
+                 release_notes_test.cc
+                 repeat_frame_test.cc
+                 recover_test.cc
+                 rect_test.cc
+                 reels_test.cc
+                 reel_writer_test.cc
+                 required_disk_space_test.cc
+                 remake_id_test.cc
+                 remake_video_test.cc
+                 remake_with_subtitle_test.cc
+                 render_subtitles_test.cc
+                 scaling_test.cc
+                 scoped_temporary_test.cc
+                 silence_padding_test.cc
+                 shuffler_test.cc
+                 skip_frame_test.cc
+                 socket_test.cc
+                 smtp_server.cc
+                 srt_subtitle_test.cc
+                 ssa_subtitle_test.cc
+                 stream_test.cc
+                 subtitle_charset_test.cc
+                 subtitle_font_id_test.cc
+                 subtitle_font_id_change_test.cc
+                 subtitle_language_test.cc
+                 subtitle_metadata_test.cc
+                 subtitle_position_test.cc
+                 subtitle_reel_test.cc
+                 subtitle_reel_number_test.cc
+                 subtitle_timing_test.cc
+                 subtitle_trim_test.cc
+                 template_test.cc
+                 ../test.cc
+                 text_decoder_test.cc
+                 text_entry_point_test.cc
+                 threed_test.cc
+                 time_calculation_test.cc
+                 torture_test.cc
+                 unzipper_test.cc
+                 update_checker_test.cc
+                 upmixer_a_test.cc
+                 util_test.cc
+                 vf_test.cc
+                 video_content_test.cc
+                 video_content_scale_test.cc
+                 video_level_test.cc
+                 video_mxf_content_test.cc
+                 vf_kdm_test.cc
+                 writer_test.cc
+                 video_trim_test.cc
+                 zipper_test.cc
+                 """
+
+    if bld.env.TARGET_LINUX and bld.env.ENABLE_DISK:
+        obj.source += " disk_writer_test.cc"
+        obj.uselib += "LWEXT4 NANOMSG "
+
+    # This one doesn't check anything
+    # resampler_test.cc
+
+    obj.target = 'unit-tests'
+    obj.install_path = ''
diff --git a/test/zipper_test.cc b/test/lib/zipper_test.cc
index 37e6176f0..f4d6ba3a9 100644
--- a/test/zipper_test.cc
+++ b/test/lib/zipper_test.cc
@@ -27,7 +27,7 @@
 
 #include "lib/exceptions.h"
 #include "lib/zipper.h"
-#include "test.h"
+#include "../test.h"
 #include <dcp/filesystem.h>
 #include <dcp/util.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/wscript b/test/wscript
index b568872a3..9b5d22ccc 100644
--- a/test/wscript
+++ b/test/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -18,190 +18,13 @@
 #
 
 def configure(conf):
-    boost_test_suffix=''
-    if conf.env.TARGET_WINDOWS_64:
-        boost_test_suffix='-mt-x64'
-    elif conf.env.TARGET_WINDOWS_32:
-        boost_test_suffix='-mt-x32'
-
-    conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
-
-    conf.check_cxx(fragment="""
-                            #define BOOST_TEST_MODULE Config test\n
-                            #include <boost/test/unit_test.hpp>\n
-                            int main() {}
-                            """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
+    conf.recurse('lib')
 
 def build(bld):
-    obj = bld(features='cxx cxxprogram')
-    obj.name   = 'unit-tests'
-    obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
-    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG JPEG '
-    obj.uselib += 'LEQM_NRT ZIP SQLITE3 '
-    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
-        obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
-    if bld.env.TARGET_LINUX:
-        obj.uselib += 'DL '
-    obj.use    = 'libdcpomatic2'
-    obj.source = """
-                 2536_regression_test.cc
-                 2986_regression_test.cc
-                 4k_test.cc
-                 analytics_test.cc
-                 atmos_test.cc
-                 audio_analysis_test.cc
-                 audio_buffers_test.cc
-                 audio_content_test.cc
-                 audio_delay_test.cc
-                 audio_filter_test.cc
-                 audio_mapping_test.cc
-                 audio_merger_test.cc
-                 audio_processor_test.cc
-                 audio_processor_delay_test.cc
-                 audio_ring_buffers_test.cc
-                 burnt_subtitle_test.cc
-                 butler_test.cc
-                 bv20_test.cc
-                 cinema_list_test.cc
-                 cinema_sound_processor_test.cc
-                 client_server_test.cc
-                 closed_caption_test.cc
-                 collator_test.cc
-                 colour_conversion_test.cc
-                 config_test.cc
-                 content_test.cc
-                 copy_dcp_details_to_film_test.cc
-                 cpl_hash_test.cc
-                 cpl_metadata_test.cc
-                 create_cli_test.cc
-                 dcpomatic_time_test.cc
-                 dcp_decoder_test.cc
-                 dcp_digest_file_test.cc
-                 dcp_examiner_test.cc
-                 dcp_metadata_test.cc
-                 dcp_playback_test.cc
-                 dcp_subtitle_test.cc
-                 digest_test.cc
-                 dkdm_recipient_list_test.cc
-                 email_test.cc
-                 empty_caption_test.cc
-                 empty_test.cc
-                 encode_cli_test.cc
-                 encryption_test.cc
-                 file_extension_test.cc
-                 ffmpeg_audio_only_test.cc
-                 ffmpeg_audio_test.cc
-                 ffmpeg_dcp_test.cc
-                 ffmpeg_decoder_error_test.cc
-                 ffmpeg_decoder_seek_test.cc
-                 ffmpeg_decoder_sequential_test.cc
-                 ffmpeg_encoder_test.cc
-                 ffmpeg_examiner_test.cc
-                 ffmpeg_properties_test.cc
-                 ffmpeg_pts_offset_test.cc
-                 ffmpeg_subtitles_test.cc
-                 file_group_test.cc
-                 file_log_test.cc
-                 file_naming_test.cc
-                 filename_charset_test.cc
-                 film_test.cc
-                 film_metadata_test.cc
-                 find_missing_test.cc
-                 font_comparator_test.cc
-                 font_id_allocator_test.cc
-                 frame_interval_checker_test.cc
-                 frame_rate_test.cc
-                 grok_util_test.cc
-                 guess_crop_test.cc
-                 hints_test.cc
-                 image_content_fade_test.cc
-                 image_filename_sorter_test.cc
-                 image_test.cc
-                 image_proxy_test.cc
-                 import_dcp_test.cc
-                 interrupt_encoder_test.cc
-                 isdcf_name_test.cc
-                 j2k_encode_threading_test.cc
-                 j2k_encoder_test.cc
-                 job_manager_test.cc
-                 j2k_video_bit_rate_test.cc
-                 kdm_cli_test.cc
-                 kdm_naming_test.cc
-                 kdm_util_test.cc
-                 low_bitrate_test.cc
-                 markers_test.cc
-                 map_cli_test.cc
-                 mca_subdescriptors_test.cc
-                 mpeg2_dcp_test.cc
-                 no_use_video_test.cc
-                 open_caption_test.cc
-                 optimise_stills_test.cc
-                 overlap_video_test.cc
-                 pixel_formats_test.cc
-                 player_test.cc
-                 playlist_test.cc
-                 pulldown_detect_test.cc
-                 ratio_test.cc
-                 relative_paths_test.cc
-                 release_notes_test.cc
-                 repeat_frame_test.cc
-                 recover_test.cc
-                 rect_test.cc
-                 reels_test.cc
-                 reel_writer_test.cc
-                 required_disk_space_test.cc
-                 remake_id_test.cc
-                 remake_video_test.cc
-                 remake_with_subtitle_test.cc
-                 render_subtitles_test.cc
-                 scaling_test.cc
-                 scoped_temporary_test.cc
-                 silence_padding_test.cc
-                 shuffler_test.cc
-                 skip_frame_test.cc
-                 socket_test.cc
-                 smtp_server.cc
-                 srt_subtitle_test.cc
-                 ssa_subtitle_test.cc
-                 stream_test.cc
-                 subtitle_charset_test.cc
-                 subtitle_font_id_test.cc
-                 subtitle_font_id_change_test.cc
-                 subtitle_language_test.cc
-                 subtitle_metadata_test.cc
-                 subtitle_position_test.cc
-                 subtitle_reel_test.cc
-                 subtitle_reel_number_test.cc
-                 subtitle_timing_test.cc
-                 subtitle_trim_test.cc
-                 template_test.cc
-                 test.cc
-                 text_decoder_test.cc
-                 text_entry_point_test.cc
-                 threed_test.cc
-                 time_calculation_test.cc
-                 torture_test.cc
-                 unzipper_test.cc
-                 update_checker_test.cc
-                 upmixer_a_test.cc
-                 util_test.cc
-                 vf_test.cc
-                 video_content_test.cc
-                 video_content_scale_test.cc
-                 video_level_test.cc
-                 video_mxf_content_test.cc
-                 vf_kdm_test.cc
-                 writer_test.cc
-                 video_trim_test.cc
-                 zipper_test.cc
-                 """
-
-    if bld.env.TARGET_LINUX and bld.env.ENABLE_DISK:
-        obj.source += " disk_writer_test.cc"
-        obj.uselib += "LWEXT4 NANOMSG "
+    bld.recurse('lib')
 
-    # This one doesn't check anything
-    # resampler_test.cc
+def pot(bld):
+    bld.recurse('lib')
 
-    obj.target = 'unit-tests'
-    obj.install_path = ''
+def pot_merge(bld):
+    bld.recurse('lib')