diff --git a/test/cfoa/fwd_tests.cpp b/test/cfoa/fwd_tests.cpp
index 12534533..80cd4a0c 100644
--- a/test/cfoa/fwd_tests.cpp
+++ b/test/cfoa/fwd_tests.cpp
@@ -37,8 +37,10 @@ bool unequal_call(boost::unordered::concurrent_flat_map<T, T>& x1,
 
 using map_type = boost::unordered::concurrent_flat_map<int, int>;
 
-#if BOOST_WORKAROUND(BOOST_CLANG_VERSION, != 30700)
-
+#if !defined(BOOST_CLANG_VERSION) ||                                           \
+  BOOST_WORKAROUND(BOOST_CLANG_VERSION, < 30700) ||                            \
+  BOOST_WORKAROUND(BOOST_CLANG_VERSION, >= 30800)
+// clang-3.7 seems to have a codegen bug here so we workaround it
 UNORDERED_AUTO_TEST (fwd_swap_call) {
   map_type x1, x2;
   swap_call(x1, x2);