diff --git a/src/fvm.hpp b/src/fvm_cell.hpp
similarity index 100%
rename from src/fvm.hpp
rename to src/fvm_cell.hpp
diff --git a/tests/test_fvm.cpp b/tests/test_fvm.cpp
index 85a25f3579aa25e2e84860b3144294269ff0895a..bc7374cbd0ea8f16b2b8adb02c4d27382aa83c61 100644
--- a/tests/test_fvm.cpp
+++ b/tests/test_fvm.cpp
@@ -3,8 +3,8 @@
 #include "gtest.h"
 #include "util.hpp"
 
-#include "../src/cell.hpp"
-#include "../src/fvm.hpp"
+#include <cell.hpp>
+#include <fvm_cell.hpp>
 
 TEST(fvm, cable)
 {
diff --git a/tests/test_synapses.cpp b/tests/test_synapses.cpp
index 5a8f2ffac903289663dc21e105523a593bd695a2..87ac3aeca2e828035dea39c7cab4bf156a4e04bf 100644
--- a/tests/test_synapses.cpp
+++ b/tests/test_synapses.cpp
@@ -2,7 +2,7 @@
 #include "util.hpp"
 
 #include <cell.hpp>
-#include <fvm.hpp>
+#include <fvm_cell.hpp>
 
 // compares results with those generated by nrn/ball_and_stick.py
 TEST(synapses, add_to_cell)
diff --git a/tests/validate_ball_and_stick.cpp b/tests/validate_ball_and_stick.cpp
index 1a9bddb7e3aaa031cbf4212e0c1898767f3682bb..5b509525b053fe389908b150b87333a27f5241ec 100644
--- a/tests/validate_ball_and_stick.cpp
+++ b/tests/validate_ball_and_stick.cpp
@@ -4,8 +4,8 @@
 #include "gtest.h"
 #include "util.hpp"
 
-#include "../src/cell.hpp"
-#include "../src/fvm.hpp"
+#include <cell.hpp>
+#include <fvm_cell.hpp>
 
 // compares results with those generated by nrn/ball_and_stick.py
 TEST(ball_and_stick, neuron_baseline)
diff --git a/tests/validate_soma.cpp b/tests/validate_soma.cpp
index 44d8235a4463e153c87fa58b325b7694440ed3a1..2353cb483967fb74757dab81ffcf96c68f3c649a 100644
--- a/tests/validate_soma.cpp
+++ b/tests/validate_soma.cpp
@@ -4,8 +4,8 @@
 #include "gtest.h"
 #include "util.hpp"
 
-#include "../src/cell.hpp"
-#include "../src/fvm.hpp"
+#include <cell.hpp>
+#include <fvm_cell.hpp>
 
 // compares results with those generated by nrn/soma.py
 // single compartment model with HH channels
diff --git a/tests/validate_synapses.cpp b/tests/validate_synapses.cpp
index 7b882a689c94cb5e6b70e8f89115917fc7a6ba0d..2ccde863cb4cbf16efbe75dd509e9c7c2095ddbe 100644
--- a/tests/validate_synapses.cpp
+++ b/tests/validate_synapses.cpp
@@ -4,7 +4,7 @@
 #include "util.hpp"
 
 #include <cell.hpp>
-#include <fvm.hpp>
+#include <fvm_cell.hpp>
 
 #include <json/src/json.hpp>