diff --git a/src/DatamodelRegistry.cc b/src/DatamodelRegistry.cc
index 599bcaaff..91f57ac38 100644
--- a/src/DatamodelRegistry.cc
+++ b/src/DatamodelRegistry.cc
@@ -32,7 +32,7 @@ size_t DatamodelRegistry::registerDatamodel(std::string name, std::string_view d
   }
 
   // TODO: Output?
-  return std::distance(m_definitions.cbegin(), it);
+  return std::ranges::distance(m_definitions.cbegin(), it);
 }
 
 size_t DatamodelRegistry::registerDatamodel(std::string name, std::string_view definition,
diff --git a/tests/unittests/frame.cpp b/tests/unittests/frame.cpp
index 6a652e66d..ae808940c 100644
--- a/tests/unittests/frame.cpp
+++ b/tests/unittests/frame.cpp
@@ -48,8 +48,8 @@ TEST_CASE("Frame parameters", "[frame][basics]") {
   const auto stringKeys = event.getParameterKeys<std::string>();
   REQUIRE(stringKeys.size() == 2);
   // Can't rely on an insertion order here
-  REQUIRE(std::find(stringKeys.begin(), stringKeys.end(), "aString") != stringKeys.end());
-  REQUIRE(std::find(stringKeys.begin(), stringKeys.end(), "someStrings") != stringKeys.end());
+  REQUIRE(std::ranges::find(stringKeys, "aString") != stringKeys.end());
+  REQUIRE(std::ranges::find(stringKeys, "someStrings") != stringKeys.end());
 }
 
 // NOTE: Due to the extremely small tasks that are done in these tests, they will