diff --git a/gtsam/linear/tests/testGaussianBayesNetUnordered.cpp b/gtsam/linear/tests/testGaussianBayesNet.cpp
similarity index 100%
rename from gtsam/linear/tests/testGaussianBayesNetUnordered.cpp
rename to gtsam/linear/tests/testGaussianBayesNet.cpp
diff --git a/gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp b/gtsam/linear/tests/testGaussianBayesTree.cpp
similarity index 100%
rename from gtsam/linear/tests/testGaussianBayesTreeUnordered.cpp
rename to gtsam/linear/tests/testGaussianBayesTree.cpp
diff --git a/gtsam/linear/tests/testGaussianConditionalUnordered.cpp b/gtsam/linear/tests/testGaussianConditional.cpp
similarity index 100%
rename from gtsam/linear/tests/testGaussianConditionalUnordered.cpp
rename to gtsam/linear/tests/testGaussianConditional.cpp
diff --git a/gtsam/linear/tests/testGaussianFactorGraphUnordered.cpp b/gtsam/linear/tests/testGaussianFactorGraph.cpp
similarity index 100%
rename from gtsam/linear/tests/testGaussianFactorGraphUnordered.cpp
rename to gtsam/linear/tests/testGaussianFactorGraph.cpp
diff --git a/gtsam/linear/tests/testHessianFactorUnordered.cpp b/gtsam/linear/tests/testHessianFactor.cpp
similarity index 100%
rename from gtsam/linear/tests/testHessianFactorUnordered.cpp
rename to gtsam/linear/tests/testHessianFactor.cpp
diff --git a/gtsam/linear/tests/testJacobianFactorUnordered.cpp b/gtsam/linear/tests/testJacobianFactor.cpp
similarity index 100%
rename from gtsam/linear/tests/testJacobianFactorUnordered.cpp
rename to gtsam/linear/tests/testJacobianFactor.cpp
diff --git a/gtsam/linear/tests/testVectorValuesUnordered.cpp b/gtsam/linear/tests/testVectorValues.cpp
similarity index 100%
rename from gtsam/linear/tests/testVectorValuesUnordered.cpp
rename to gtsam/linear/tests/testVectorValues.cpp
diff --git a/gtsam/symbolic/tests/testVariableIndexUnordered.cpp b/gtsam/symbolic/tests/testVariableIndex.cpp
similarity index 100%
rename from gtsam/symbolic/tests/testVariableIndexUnordered.cpp
rename to gtsam/symbolic/tests/testVariableIndex.cpp
diff --git a/tests/testGaussianBayesTree.cpp b/tests/testGaussianBayesTreeB.cpp
similarity index 100%
rename from tests/testGaussianBayesTree.cpp
rename to tests/testGaussianBayesTreeB.cpp