diff --git a/test/eos_unit_test_helpers.hpp b/test/eos_unit_test_helpers.hpp
index 1d00b2e606b..b5bf7bde90f 100644
--- a/test/eos_unit_test_helpers.hpp
+++ b/test/eos_unit_test_helpers.hpp
@@ -82,7 +82,7 @@ inline void array_compare(int num, X &&x, Y &&y, Z &&z, ZT &&ztrue, XN xname, YN
 }
 
 template <typename E1, typename E2>
-inline void compare_two_eoss(const E1 &&test_e, const E2 &&ref_e) {
+inline void compare_two_eoss(const E1 &test_e, const E2 &ref_e) {
   // compare all individual member functions with 1 as inputs,
   // this function is meant to catch mis-implementations of
   // modifiers that can be initialized in such a way as to
diff --git a/test/test_eos_modifiers.cpp b/test/test_eos_modifiers.cpp
index 2cc1a72d00f..09c52ecdfc0 100644
--- a/test/test_eos_modifiers.cpp
+++ b/test/test_eos_modifiers.cpp
@@ -20,6 +20,10 @@
 #include <singularity-eos/eos/eos.hpp>
 #include <singularity-eos/eos/eos_builder.hpp>
 
+#ifdef SINGULARITY_BUILD_CLOSURE
+#include <singularity-eos/eos/singularity_eos.hpp>
+#endif
+
 #ifndef CATCH_CONFIG_FAST_COMPILE
 #define CATCH_CONFIG_FAST_COMPILE
 #include <catch2/catch_test_macros.hpp>
@@ -41,6 +45,7 @@ using singularity::ScaledEOS;
 using singularity::ShiftedEOS;
 using singularity::UnitSystem;
 
+#ifndef SINGULARITY_BUILD_CLOSURE
 // recreate variadic list
 template <typename... Ts>
 using tl = variadic_utils::type_list<Ts...>;
@@ -93,6 +98,7 @@ static constexpr const auto ramped_all =
 static constexpr const auto combined_list =
     variadic_utils::concat(combined_list_1, ramped_all);
 using EOS = typename decltype(tl_to_Variant(combined_list))::vt;
+#endif
 
 SCENARIO("EOS Builder and Modifiers", "[EOSBuilder][Modifiers][IdealGas]") {