diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c037972..668d724d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists.txt (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+# Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 # University of Bristol. All rights reserved.
 #
 # This program is provided under a three-clause BSD license. For full
diff --git a/LICENSE b/LICENSE
index bec93114..d650624e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 University of Bristol. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/core/Context.cpp b/src/core/Context.cpp
index 0c71116e..94c79c64 100644
--- a/src/core/Context.cpp
+++ b/src/core/Context.cpp
@@ -1,5 +1,5 @@
 // Context.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Context.h b/src/core/Context.h
index 131caab5..74205363 100644
--- a/src/core/Context.h
+++ b/src/core/Context.h
@@ -1,5 +1,5 @@
 // Context.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Kernel.cpp b/src/core/Kernel.cpp
index 541dbbf8..11f9bb9e 100644
--- a/src/core/Kernel.cpp
+++ b/src/core/Kernel.cpp
@@ -1,5 +1,5 @@
 // Kernel.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Kernel.h b/src/core/Kernel.h
index b5cbcb24..c5327d3c 100644
--- a/src/core/Kernel.h
+++ b/src/core/Kernel.h
@@ -1,5 +1,5 @@
 // Kernel.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/KernelInvocation.cpp b/src/core/KernelInvocation.cpp
index aa5261d3..a7f4df94 100644
--- a/src/core/KernelInvocation.cpp
+++ b/src/core/KernelInvocation.cpp
@@ -1,5 +1,5 @@
 // KernelInvocation.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/KernelInvocation.h b/src/core/KernelInvocation.h
index 9f512ba7..933d86fe 100644
--- a/src/core/KernelInvocation.h
+++ b/src/core/KernelInvocation.h
@@ -1,5 +1,5 @@
 // KernelInvocation.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Memory.cpp b/src/core/Memory.cpp
index 17e6311c..b65881db 100644
--- a/src/core/Memory.cpp
+++ b/src/core/Memory.cpp
@@ -1,5 +1,5 @@
 // Memory.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Memory.h b/src/core/Memory.h
index a416c0b0..a3463e80 100644
--- a/src/core/Memory.h
+++ b/src/core/Memory.h
@@ -1,5 +1,5 @@
 // Memory.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp
index bab80db2..80d70568 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -1,5 +1,5 @@
 // Plugin.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Plugin.h b/src/core/Plugin.h
index df7c863c..0413ae7f 100644
--- a/src/core/Plugin.h
+++ b/src/core/Plugin.h
@@ -1,5 +1,5 @@
 // Plugin.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Program.cpp b/src/core/Program.cpp
index e754a586..459a9a4f 100644
--- a/src/core/Program.cpp
+++ b/src/core/Program.cpp
@@ -1,5 +1,5 @@
 // Program.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Program.h b/src/core/Program.h
index 64feee0b..a7513549 100644
--- a/src/core/Program.h
+++ b/src/core/Program.h
@@ -1,5 +1,5 @@
 // Program.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Queue.cpp b/src/core/Queue.cpp
index b61c4398..f6b26710 100644
--- a/src/core/Queue.cpp
+++ b/src/core/Queue.cpp
@@ -1,5 +1,5 @@
 // Queue.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/Queue.h b/src/core/Queue.h
index 82cbac12..716b1578 100644
--- a/src/core/Queue.h
+++ b/src/core/Queue.h
@@ -1,5 +1,5 @@
 // Queue.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/WorkGroup.cpp b/src/core/WorkGroup.cpp
index 3542daea..ead3bbf9 100644
--- a/src/core/WorkGroup.cpp
+++ b/src/core/WorkGroup.cpp
@@ -1,5 +1,5 @@
 // WorkGroup.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/WorkGroup.h b/src/core/WorkGroup.h
index b3469a7f..d72523c2 100644
--- a/src/core/WorkGroup.h
+++ b/src/core/WorkGroup.h
@@ -1,5 +1,5 @@
 // WorkGroup.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/WorkItem.cpp b/src/core/WorkItem.cpp
index 9c087142..844cfe3d 100644
--- a/src/core/WorkItem.cpp
+++ b/src/core/WorkItem.cpp
@@ -1,5 +1,5 @@
 // WorkItem.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.`
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/WorkItem.h b/src/core/WorkItem.h
index 9da269b0..61fb8ded 100644
--- a/src/core/WorkItem.h
+++ b/src/core/WorkItem.h
@@ -1,5 +1,5 @@
 // WorkItem.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/WorkItemBuiltins.cpp b/src/core/WorkItemBuiltins.cpp
index 63b5e03a..4c7702ff 100644
--- a/src/core/WorkItemBuiltins.cpp
+++ b/src/core/WorkItemBuiltins.cpp
@@ -1,5 +1,5 @@
 // WorkItemBuiltins.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/common.cpp b/src/core/common.cpp
index ea92196c..e73a2d34 100644
--- a/src/core/common.cpp
+++ b/src/core/common.cpp
@@ -1,5 +1,5 @@
 // common.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/common.h b/src/core/common.h
index 0c39b3fa..f8dfaee7 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -1,5 +1,5 @@
 // common.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/half.cpp b/src/core/half.cpp
index c7cf59a6..aa9b304b 100644
--- a/src/core/half.cpp
+++ b/src/core/half.cpp
@@ -1,5 +1,5 @@
 // half.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/core/half.h b/src/core/half.h
index 120fa36e..ce0a8b66 100644
--- a/src/core/half.h
+++ b/src/core/half.h
@@ -1,5 +1,5 @@
 // half.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/kernel/Simulation.cpp b/src/kernel/Simulation.cpp
index 652e32f8..19bf0ea5 100644
--- a/src/kernel/Simulation.cpp
+++ b/src/kernel/Simulation.cpp
@@ -1,5 +1,5 @@
 // Simulation.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/kernel/Simulation.h b/src/kernel/Simulation.h
index 63edb7e6..53a42d87 100644
--- a/src/kernel/Simulation.h
+++ b/src/kernel/Simulation.h
@@ -1,5 +1,5 @@
 // Simulation.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/kernel/oclgrind-kernel.cpp b/src/kernel/oclgrind-kernel.cpp
index 1cb326c8..bdba4d64 100644
--- a/src/kernel/oclgrind-kernel.cpp
+++ b/src/kernel/oclgrind-kernel.cpp
@@ -1,5 +1,5 @@
 // main.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
@@ -193,7 +193,7 @@ static bool parseArguments(int argc, char *argv[])
       cout << endl;
       cout << "Oclgrind " PACKAGE_VERSION << endl;
       cout << endl;
-      cout << "Copyright (c) 2013-2018" << endl;
+      cout << "Copyright (c) 2013-2019" << endl;
       cout << "James Price and Simon McIntosh-Smith, University of Bristol"
            << endl;
       cout << "https://github.com/jrprice/Oclgrind" << endl;
diff --git a/src/plugins/InstructionCounter.cpp b/src/plugins/InstructionCounter.cpp
index de61c80c..fa0dd2f3 100644
--- a/src/plugins/InstructionCounter.cpp
+++ b/src/plugins/InstructionCounter.cpp
@@ -1,5 +1,5 @@
 // InstructionCounter.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/InstructionCounter.h b/src/plugins/InstructionCounter.h
index 3722c649..4bfd6e99 100644
--- a/src/plugins/InstructionCounter.h
+++ b/src/plugins/InstructionCounter.h
@@ -1,5 +1,5 @@
 // InstructionCounter.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/InteractiveDebugger.cpp b/src/plugins/InteractiveDebugger.cpp
index 79ca54e8..a45feed9 100644
--- a/src/plugins/InteractiveDebugger.cpp
+++ b/src/plugins/InteractiveDebugger.cpp
@@ -1,5 +1,5 @@
 // InteractiveDebugger.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/InteractiveDebugger.h b/src/plugins/InteractiveDebugger.h
index d6c77756..60eb85bf 100644
--- a/src/plugins/InteractiveDebugger.h
+++ b/src/plugins/InteractiveDebugger.h
@@ -1,5 +1,5 @@
 // InteractiveDebugger.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/Logger.cpp b/src/plugins/Logger.cpp
index ba492336..0042c625 100644
--- a/src/plugins/Logger.cpp
+++ b/src/plugins/Logger.cpp
@@ -1,5 +1,5 @@
 // Logger.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/Logger.h b/src/plugins/Logger.h
index 62bbcc82..11b7410c 100644
--- a/src/plugins/Logger.h
+++ b/src/plugins/Logger.h
@@ -1,5 +1,5 @@
 // Logger.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/MemCheck.cpp b/src/plugins/MemCheck.cpp
index c4d74740..e583e796 100644
--- a/src/plugins/MemCheck.cpp
+++ b/src/plugins/MemCheck.cpp
@@ -1,5 +1,5 @@
 // MemCheck.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/MemCheck.h b/src/plugins/MemCheck.h
index 7e72d8a5..e07f6712 100644
--- a/src/plugins/MemCheck.h
+++ b/src/plugins/MemCheck.h
@@ -1,5 +1,5 @@
 // MemCheck.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/RaceDetector.cpp b/src/plugins/RaceDetector.cpp
index 770373b1..6b6e66c6 100644
--- a/src/plugins/RaceDetector.cpp
+++ b/src/plugins/RaceDetector.cpp
@@ -1,5 +1,5 @@
 // RaceDetector.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/plugins/RaceDetector.h b/src/plugins/RaceDetector.h
index c65cbd34..4f463a52 100644
--- a/src/plugins/RaceDetector.h
+++ b/src/plugins/RaceDetector.h
@@ -1,5 +1,5 @@
 // RaceDetector.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/runtime/async_queue.cpp b/src/runtime/async_queue.cpp
index f14add5d..2dcf9fec 100644
--- a/src/runtime/async_queue.cpp
+++ b/src/runtime/async_queue.cpp
@@ -1,5 +1,5 @@
 // async_queue.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/runtime/async_queue.h b/src/runtime/async_queue.h
index 6f9a3953..a604b044 100644
--- a/src/runtime/async_queue.h
+++ b/src/runtime/async_queue.h
@@ -1,5 +1,5 @@
 // async_queue.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/runtime/icd.h b/src/runtime/icd.h
index f312a309..0a2dfa8b 100644
--- a/src/runtime/icd.h
+++ b/src/runtime/icd.h
@@ -1,5 +1,5 @@
 // icd.h (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/src/runtime/oclgrind.cpp b/src/runtime/oclgrind.cpp
index 017ed7d5..7b3ad965 100644
--- a/src/runtime/oclgrind.cpp
+++ b/src/runtime/oclgrind.cpp
@@ -1,5 +1,5 @@
 // oclgrind.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
@@ -344,7 +344,7 @@ static bool parseArguments(int argc, char *argv[])
       cout << endl;
       cout << "Oclgrind " PACKAGE_VERSION << endl;
       cout << endl;
-      cout << "Copyright (c) 2013-2018" << endl;
+      cout << "Copyright (c) 2013-2019" << endl;
       cout << "James Price and Simon McIntosh-Smith, University of Bristol"
            << endl;
       cout << "https://github.com/jrprice/Oclgrind" << endl;
diff --git a/src/runtime/runtime.cpp b/src/runtime/runtime.cpp
index d46dbb25..c249d596 100644
--- a/src/runtime/runtime.cpp
+++ b/src/runtime/runtime.cpp
@@ -1,5 +1,5 @@
 // runtime.cpp (Oclgrind)
-// Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+// Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 // University of Bristol. All rights reserved.
 //
 // This program is provided under a three-clause BSD license. For full
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index fea836f2..00000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-# Makefile.am (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
-# University of Bristol. All rights reserved.
-#
-# This program is provided under a three-clause BSD license. For full
-# license terms please see the LICENSE file distributed with this
-# source code.
-
-AUTOMAKE_OPTIONS = subdir-objects
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-
-AM_CFLAGS = -std=c99 -I$(top_srcdir)/src/ -I${srcdir}/common -Wall
-LDADD     = ../liboclgrind-rt.la libcommon.la
-
-noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = common/common.c common/common.h
-
-check_PROGRAMS = \
-  apps/image/image \
-  apps/vecadd/vecadd \
-  runtime/map_buffer
-TESTS = $(check_PROGRAMS)
-
-if HAVE_PYTHON
-
-TEST_EXTENSIONS = .sim
-LOG_COMPILER = $(PYTHON) \
-  $(srcdir)/run_test.py  \
-  ${abs_top_builddir}/oclgrind-kernel
-SIM_LOG_COMPILER = $(PYTHON)        \
-  $(srcdir)/run_test.py  \
-  ${abs_top_builddir}/oclgrind-kernel
-AM_TESTS_ENVIRONMENT = \
-  export OCLGRIND_PCH_DIR=$(abs_top_builddir)/src/include/oclgrind;
-
-TESTS += $(KERNEL_TESTS)
-#XFAIL_TESTS =
-
-clean-local:
-	find . -name '*.out' -exec rm -f {} \;
-
-else
-check-local:
-	@echo
-	@echo "WARNING: Tests will not be run (Python required)."
-	@echo
-endif
-
-EXTRA_DIST = run_test.py kernels/TESTS $(KERNEL_TEST_INPUTS) \
-  runtime/map_buffer.ref
diff --git a/tests/apps/CMakeLists.txt b/tests/apps/CMakeLists.txt
index 2c1abb51..33c80aad 100644
--- a/tests/apps/CMakeLists.txt
+++ b/tests/apps/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists.txt (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+# Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 # University of Bristol. All rights reserved.
 #
 # This program is provided under a three-clause BSD license. For full
diff --git a/tests/kernels/CMakeLists.txt b/tests/kernels/CMakeLists.txt
index 22321155..1ede9d96 100644
--- a/tests/kernels/CMakeLists.txt
+++ b/tests/kernels/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists.txt (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+# Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 # University of Bristol. All rights reserved.
 #
 # This program is provided under a three-clause BSD license. For full
diff --git a/tests/run_test.py b/tests/run_test.py
index 0db819fb..4a1b7024 100644
--- a/tests/run_test.py
+++ b/tests/run_test.py
@@ -1,5 +1,5 @@
 # run_test.py (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+# Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 # University of Bristol. All rights reserved.
 #
 # This program is provided under a three-clause BSD license. For full
diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt
index d61cc10f..3a047c5b 100644
--- a/tests/runtime/CMakeLists.txt
+++ b/tests/runtime/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists.txt (Oclgrind)
-# Copyright (c) 2013-2016, James Price and Simon McIntosh-Smith,
+# Copyright (c) 2013-2019, James Price and Simon McIntosh-Smith,
 # University of Bristol. All rights reserved.
 #
 # This program is provided under a three-clause BSD license. For full