diff --git a/.gitattributes b/.gitattributes
index 0a06d1036b25cd6b1dd52aea19ca2b0ff614553b..51406ab22e818e25e38a7777e14c00343e3dfcd7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1765,6 +1765,7 @@ CMake/variants/variants.cbt010 -text
CMake/variants/variants.dop282 -text
CMake/variants/variants.dop320 -text
CMake/variants/variants.dragproc -text
+CMake/variants/variants.fs5 -text
CMake/variants/variants.head01 -text
CMake/variants/variants.lcs157 -text
CMake/variants/variants.lexar -text
diff --git a/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.run b/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.run
index f56191fcce6c1419554ccab8242e16e69642e0e4..1678dd86f1ef83692797986a4d3a9af784c456cd 100755
--- a/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.run
+++ b/CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.run
@@ -3,8 +3,8 @@
# Define the path for finding the library.
#LD_LIBRARY_PATH=../src:/Users/diepen/external/lib:$LD_LIBRARYPATH
#DYLD_LIBRARY_PATH=../src:/Users/diepen/external/lib:$DYLD_LIBRARYPATH
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
echo $LD_LIBRARY_PATH
diff --git a/CEP/DP3/PythonDPPP/test/tPythonStep.run b/CEP/DP3/PythonDPPP/test/tPythonStep.run
index e5dc9ba0b0d718c0a35a6450d17c632c89614eb9..3d7416429f9567f36e4acab05f74843784fe7536 100755
--- a/CEP/DP3/PythonDPPP/test/tPythonStep.run
+++ b/CEP/DP3/PythonDPPP/test/tPythonStep.run
@@ -14,8 +14,8 @@ tar zxf $srcdir/../../DPPP/test/tNDPPP.in_MS.tgz
mv tNDPPP_tmp.MS tPythonStep_tmp.MS
# Define the path for finding the library.
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
diff --git a/CEP/DP3/TestDynDPPP/test/tTestDynStep.run b/CEP/DP3/TestDynDPPP/test/tTestDynStep.run
index f23bb3595c4b27321cc7870ec7e8c1555a3322ef..2987402091ea6f4e39ffab738e382cd9cad22d98 100755
--- a/CEP/DP3/TestDynDPPP/test/tTestDynStep.run
+++ b/CEP/DP3/TestDynDPPP/test/tTestDynStep.run
@@ -1,8 +1,8 @@
#!/bin/sh
# Define the path for finding the library.
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
diff --git a/CMake/variants/variants.fs5 b/CMake/variants/variants.fs5
new file mode 100644
index 0000000000000000000000000000000000000000..cb8823233188a0927e50224b4e64c20e66c0510d
--- /dev/null
+++ b/CMake/variants/variants.fs5
@@ -0,0 +1,67 @@
+# Definitions file for DAS5 compiler suite.
+#
+# Compiler suite
+set(LOFAR_COMPILER_SUITES GNU)
+
+# Build variants
+set(LOFAR_BUILD_VARIANTS DEBUG OPT OPT3 OPTARCH)
+
+# After loading the right gcc version module (not tested with other compilers)
+if(NOT (DEFINED ENV{CC} AND DEFINED ENV{CXX} AND DEFINED ENV{FC}))
+ message(FATAL_ERROR "CC, CXX and FC environment variables are required. Have you loaded the compile module?")
+endif()
+
+set(GNU_COMPILERS GNU_C GNU_CXX GNU_Fortran GNU_ASM)
+set(GNU_C $ENV{CC} ) # C compiler
+set(GNU_CXX $ENV{CXX} ) # C++ compiler
+set(GNU_Fortran $ENV{FC} ) # Fortran compiler
+set(GNU_ASM $ENV{CC} ) # assembler
+
+message(WARNING "Building using fs5 variants file. Compilers picked based on environment variables, flags are based on directory name (e.g. gnu_opt assumes gnu compiler suite). This could be inconsistent and cause problems.")
+
+# if(NOT ENV{FOO_HOME})
+# message(FATAL_ERROR "Could not find FOO_HOME environment variable")
+# endif(NOT ENV{FOO_HOME}))
+#
+#
+#
+# DAS5 specific settings
+option(USE_QPID "Use Qpid" OFF)
+option(USE_OPENMP "Use OpenMP" ON)
+set(WCSLIB_ROOT_DIR $ENV{WCSLIB_ROOT_DIR} )
+set(CFITSIO_ROOT_DIR $ENV{CFITSIO_ROOT_DIR} )
+set(CASAREST_ROOT_DIR $ENV{CASAREST_ROOT_DIR} )
+set(CASACORE_ROOT_DIR $ENV{CASACORE_ROOT_DIR} )
+set(LOG4CPLUS_ROOT_DIR $ENV{LOG4CPLUS_ROOT_DIR} )
+set(PYTHON_BDSF $ENV{PYBDSF_ROOT_DIR} )
+set(AOFLAGGER_ROOT_DIR $ENV{AOFLAGGER_ROOT_DIR} )
+
+set(GNU_C_FLAGS "-W -Wall -Wno-unknown-pragmas")
+set(GNU_C_FLAGS_DEBUG "-g")
+set(GNU_C_FLAGS_OPT "-g -O2")
+set(GNU_C_FLAGS_OPT3 "-g -O3")
+set(GNU_C_FLAGS_OPTARCH "-g -O3 -march=native")
+set(GNU_CXX_FLAGS "-W -Wall -Woverloaded-virtual -Wno-unknown-pragmas")
+set(GNU_CXX_FLAGS_DEBUG "-g")
+set(GNU_CXX_FLAGS_OPT "-g -O2")
+set(GNU_CXX_FLAGS_OPT3 "-g -O3")
+set(GNU_CXX_FLAGS_OPTARCH "-g -O3 -march=native")
+set(GNU_EXE_LINKER_FLAGS)
+set(GNU_EXE_LINKER_FLAGS_DEBUG)
+set(GNU_EXE_LINKER_FLAGS_OPT)
+set(GNU_EXE_LINKER_FLAGS_OPT3)
+set(GNU_EXE_LINKER_FLAGS_OPTARCH)
+set(GNU_SHARED_LINKER_FLAGS)
+set(GNU_SHARED_LINKER_FLAGS_DEBUG)
+set(GNU_SHARED_LINKER_FLAGS_OPT)
+set(GNU_SHARED_LINKER_FLAGS_OPT3)
+set(GNU_SHARED_LINKER_FLAGS_OPTARCH)
+set(GNU_COMPILE_DEFINITIONS)
+set(GNU_COMPILE_DEFINITIONS_DEBUG
+ "-DLOFAR_DEBUG -DENABLE_DBGASSERT -DENABLE_TRACER")
+set(GNU_COMPILE_DEFINITIONS_OPT)
+set(GNU_COMPILE_DEFINITIONS_OPT3
+ "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")
+set(GNU_COMPILE_DEFINITIONS_OPTARCH
+ "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")
+
diff --git a/LCS/Messaging/python/messaging/test/CMakeLists.txt b/LCS/Messaging/python/messaging/test/CMakeLists.txt
index b4816dd96b7b390e47416c128a367e64345c46e6..361727be5357441a3abe5f8bf3a66c8853f99871 100644
--- a/LCS/Messaging/python/messaging/test/CMakeLists.txt
+++ b/LCS/Messaging/python/messaging/test/CMakeLists.txt
@@ -2,7 +2,18 @@
include(LofarCTest)
-lofar_add_test(t_messages)
-lofar_add_test(t_messagebus)
-lofar_add_test(t_RPC)
-lofar_add_test(t_service_message_handler)
+set(_qpid_tests
+ t_messages
+ t_messagebus
+ t_RPC
+ t_service_message_handler)
+
+if(HAVE_QPID)
+ foreach(_test ${_qpid_tests})
+ lofar_add_test(${_test})
+ endforeach()
+else()
+ lofar_join_arguments(_qpid_tests)
+ message(WARNING "Qpid is not set."
+ "The following tests will not be run: ${_qpid_tests}")
+endif()
diff --git a/SAS/OTDB_Services/test/CMakeLists.txt b/SAS/OTDB_Services/test/CMakeLists.txt
index d520d61ca2a532fb0478e8466005be958498a0a7..513a09629072e60ae5465fda6babbf58318636b9 100644
--- a/SAS/OTDB_Services/test/CMakeLists.txt
+++ b/SAS/OTDB_Services/test/CMakeLists.txt
@@ -4,6 +4,16 @@ include(LofarCTest)
lofar_find_package(Python REQUIRED)
-lofar_add_test(t_TreeService)
-lofar_add_test(t_TreeStatusEvents)
+set(_qpid_tests
+ t_TreeService
+ t_TreeStatusEvents)
+if(HAVE_QPID)
+ foreach(_test ${_qpid_tests})
+ lofar_add_test(${_test})
+ endforeach()
+else()
+ lofar_join_arguments(_qpid_tests)
+ message(WARNING "Qpid is not set."
+ "The following tests will not be run: ${_qpid_tests}")
+endif()