diff --git a/Framework/NexusGeometry/src/NexusGeometryParser.cpp b/Framework/NexusGeometry/src/NexusGeometryParser.cpp
index 7e7b82c64f4d57f74855d50348723c7f14256577..e912725a68c3c3def6bfd6315db159d31c6a3660 100644
--- a/Framework/NexusGeometry/src/NexusGeometryParser.cpp
+++ b/Framework/NexusGeometry/src/NexusGeometryParser.cpp
@@ -574,7 +574,7 @@ void parseAndAddSample(const H5File &file, const Group &root,
   H5std_string samplePath = "raw_data_1/sample";
   Group sampleGroup = root.openGroup(samplePath);
   auto sampleTransforms = getTransformations(file, sampleGroup);
-  auto samplePos = sampleTransforms * Eigen::Vector3d(0.0, 0.0, 0.0);
+  Eigen::Vector3d samplePos = sampleTransforms * Eigen::Vector3d(0.0, 0.0, 0.0);
   builder.addSample(sampleName, samplePos);
 }
 
diff --git a/Framework/NexusGeometry/test/InstrumentBuilderTest.h b/Framework/NexusGeometry/test/InstrumentBuilderTest.h
index 967b8956fbb72b0c99206107f0f316be83f24045..ace61b73eb04233875e1ef96fb02f29ad1e5c531 100644
--- a/Framework/NexusGeometry/test/InstrumentBuilderTest.h
+++ b/Framework/NexusGeometry/test/InstrumentBuilderTest.h
@@ -19,6 +19,13 @@ using namespace NexusGeometry;
 
 class InstrumentBuilderTest : public CxxTest::TestSuite {
 public:
+  // This pair of boilerplate methods prevent the suite being created statically
+  // This means the constructor isn't called when running other tests
+  static InstrumentBuilderTest *createSuite() {
+    return new InstrumentBuilderTest();
+  }
+  static void destroySuite(InstrumentBuilderTest *suite) { delete suite; }
+
   void testAddComponent() {
     InstrumentBuilder builder(this->iTestName);
 
diff --git a/Framework/NexusGeometry/test/NexusGeometryParserTest.h b/Framework/NexusGeometry/test/NexusGeometryParserTest.h
index 938b8ab458df90347e83ae7aa972769d56adf98d..165df8376c79be688856f9e9b8e0580f856b0cd5 100644
--- a/Framework/NexusGeometry/test/NexusGeometryParserTest.h
+++ b/Framework/NexusGeometry/test/NexusGeometryParserTest.h
@@ -35,6 +35,13 @@ extractBeamline(const Mantid::Geometry::Instrument &instrument) {
 } // namespace
 class NexusGeometryParserTest : public CxxTest::TestSuite {
 public:
+  // This pair of boilerplate methods prevent the suite being created statically
+  // This means the constructor isn't called when running other tests
+  static NexusGeometryParserTest *createSuite() {
+    return new NexusGeometryParserTest();
+  }
+  static void destroySuite(NexusGeometryParserTest *suite) { delete suite; }
+
   std::unique_ptr<const Mantid::Geometry::Instrument> makeTestInstrument() {
     H5std_string nexusFilename = "SMALLFAKE_example_geometry.hdf5";
     const auto fullpath = Kernel::ConfigService::Instance().getFullPath(