diff --git a/test/entt/entity/group.cpp b/test/entt/entity/group.cpp
index 49f239f98..88bf4fc88 100644
--- a/test/entt/entity/group.cpp
+++ b/test/entt/entity/group.cpp
@@ -197,7 +197,7 @@ TEST(NonOwningGroup, Sort) {
     ASSERT_EQ(*(group.data() + 2u), e2);
 
     group.sort([](const entt::entity lhs, const entt::entity rhs) {
-        return std::underlying_type_t<entt::entity>(lhs) < std::underlying_type_t<entt::entity>(rhs);
+        return entt::to_integral(lhs) < entt::to_integral(rhs);
     });
 
     ASSERT_EQ(*(group.raw<unsigned int>() + 0u), 0u);
diff --git a/test/entt/entity/sparse_set.cpp b/test/entt/entity/sparse_set.cpp
index 2bc7bf5a4..8e1933a2a 100644
--- a/test/entt/entity/sparse_set.cpp
+++ b/test/entt/entity/sparse_set.cpp
@@ -74,7 +74,7 @@ TEST(SparseSet, Functionalities) {
 
 TEST(SparseSet, Pagination) {
     entt::sparse_set<entt::entity> set;
-    constexpr auto entt_per_page = ENTT_PAGE_SIZE / sizeof(std::underlying_type_t<entt::entity>);
+    constexpr auto entt_per_page = ENTT_PAGE_SIZE / sizeof(entt::entity);
 
     ASSERT_EQ(set.extent(), 0);