diff --git a/src/swift.h b/src/swift.h
index 562a1fd5f49e3599693940aafd4cb305743eed7e..b9f8818d8b833231971abb1afb36ee4507648488 100644
--- a/src/swift.h
+++ b/src/swift.h
@@ -46,6 +46,7 @@
 #include "gravity.h"
 #include "gravity_derivatives.h"
 #include "gravity_properties.h"
+#include "hashmap.h"
 #include "hydro.h"
 #include "hydro_properties.h"
 #include "lock.h"
diff --git a/tests/testHashmap.c b/tests/testHashmap.c
index a34f18510314484272544ee96a3d50137c30957c..123c5ca05585bd279bb73ea22f6fee0f6f97f846 100644
--- a/tests/testHashmap.c
+++ b/tests/testHashmap.c
@@ -20,15 +20,24 @@
 /* Config parameters. */
 #include "../config.h"
 
+#include <fenv.h>
+
 /* Local headers. */
 #include "swift.h"
 
-#include "../src/c_hashmap/hashmap.h"
-
 #define NUM_KEYS (26 * 1000 * 1000)
 
 int main(int argc, char *argv[]) {
 
+  /* Initialize CPU frequency, this also starts time. */
+  unsigned long long cpufreq = 0;
+  clocks_set_cpufreq(cpufreq);
+
+/* Choke on FPEs */
+#ifdef HAVE_FE_ENABLE_EXCEPT
+  feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+#endif
+
   hashmap_t m;
 
   message("Initialising hash table...");