diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index a04d23b..2d003f9 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -32,6 +32,9 @@ CHECK_RELEASE = YES
 #   take effect.
 #IOCS_APPL_TOP = </IOC/path/to/application/top>
 
+# Set this when you wish to build the programs to test LZ4 decompression
+#BUILD_TEST_LZ4 = YES
+
 # Get settings from AREA_DETECTOR, so we only have to configure once for all detectors if we want to
 -include $(AREA_DETECTOR)/configure/CONFIG_SITE
 -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
diff --git a/eigerApp/Makefile b/eigerApp/Makefile
index 4262911..ca715b0 100644
--- a/eigerApp/Makefile
+++ b/eigerApp/Makefile
@@ -1,6 +1,9 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
+ifeq ($(BUILD_TEST_LZ4), YES)
+  DIRS := $(DIRS) testLZ4
+endif
 DIRS := $(DIRS) frozenSrc
 DIRS := $(DIRS) tinyCBORSrc
 DIRS := $(DIRS) compressionSrc
diff --git a/eigerApp/src/Makefile b/eigerApp/src/Makefile
index b6cbe2f..db9de56 100755
--- a/eigerApp/src/Makefile
+++ b/eigerApp/src/Makefile
@@ -31,11 +31,6 @@ else
   LIB_SYS_LIBS  += hdf5_hl
 endif
 
-PROD += test_lz4
-test_lz4_SRCS += test_lz4.cpp
-test_lz4_LIBS += dectrisCompression
-test_lz4_SYS_LIBS += lz4
-
 include $(ADCORE)/ADApp/commonLibraryMakefile
 
 #=============================
diff --git a/eigerApp/testLZ4/Makefile b/eigerApp/testLZ4/Makefile
new file mode 100755
index 0000000..f395071
--- /dev/null
+++ b/eigerApp/testLZ4/Makefile
@@ -0,0 +1,18 @@
+TOP=../..
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+
+PROD += test_lz4
+test_lz4_SRCS += test_lz4.cpp
+test_lz4_LIBS += dectrisCompression
+test_lz4_SYS_LIBS += lz4
+
+include $(ADCORE)/ADApp/commonLibraryMakefile
+
+#=============================
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+
diff --git a/eigerApp/src/Stream2_lz4_data b/eigerApp/testLZ4/Stream2_lz4_data
similarity index 100%
rename from eigerApp/src/Stream2_lz4_data
rename to eigerApp/testLZ4/Stream2_lz4_data
diff --git a/eigerApp/src/Stream_lz4_data b/eigerApp/testLZ4/Stream_lz4_data
similarity index 100%
rename from eigerApp/src/Stream_lz4_data
rename to eigerApp/testLZ4/Stream_lz4_data
diff --git a/eigerApp/src/test_lz4.cpp b/eigerApp/testLZ4/test_lz4.cpp
similarity index 100%
rename from eigerApp/src/test_lz4.cpp
rename to eigerApp/testLZ4/test_lz4.cpp