diff --git a/test/entt/container/dense_map.cpp b/test/entt/container/dense_map.cpp
index 847aac556..ecc1592f3 100644
--- a/test/entt/container/dense_map.cpp
+++ b/test/entt/container/dense_map.cpp
@@ -819,7 +819,7 @@ TEST(DenseMap, EraseFromBucket) {
     for(std::size_t next{}; next < 4u; ++next) {
         ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next, 2u * minimum_bucket_count * next).second);
         ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next + 2u, 2u * minimum_bucket_count * next + 2u).second);
-        ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * (next + 1u) - 1u, 2u * minimum_bucket_count * (next + 1u) - 1u).second);
+        ASSERT_TRUE(map.emplace(2u * minimum_bucket_count * next + 3u, 2u * minimum_bucket_count * next + 3u).second);
     }
 
     ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count);
@@ -827,7 +827,7 @@ TEST(DenseMap, EraseFromBucket) {
 
     ASSERT_EQ(map.bucket_size(0u), 4u);
     ASSERT_EQ(map.bucket_size(2u), 4u);
-    ASSERT_EQ(map.bucket_size(15u), 4u);
+    ASSERT_EQ(map.bucket_size(3u), 4u);
 
     map.erase(map.end() - 3, map.end());
 
@@ -836,7 +836,7 @@ TEST(DenseMap, EraseFromBucket) {
 
     ASSERT_EQ(map.bucket_size(0u), 3u);
     ASSERT_EQ(map.bucket_size(2u), 3u);
-    ASSERT_EQ(map.bucket_size(15u), 3u);
+    ASSERT_EQ(map.bucket_size(3u), 3u);
 
     for(std::size_t next{}; next < 3u; ++next) {
         ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next));
@@ -845,31 +845,31 @@ TEST(DenseMap, EraseFromBucket) {
         ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next + 2u));
         ASSERT_EQ(map.bucket(2u * minimum_bucket_count * next + 2u), 2u);
 
-        ASSERT_TRUE(map.contains(2u * minimum_bucket_count * (next + 1u) - 1u));
-        ASSERT_EQ(map.bucket(2u * minimum_bucket_count * (next + 1u) - 1u), 15u);
+        ASSERT_TRUE(map.contains(2u * minimum_bucket_count * next + 3u));
+        ASSERT_EQ(map.bucket(2u * minimum_bucket_count * next + 3u), 3u);
     }
 
     ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u));
     ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u + 2u));
-    ASSERT_FALSE(map.contains(2u * minimum_bucket_count * (3u + 1u) - 1u));
+    ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 3u + 3u));
 
     map.erase((++map.begin(0u))->first);
     map.erase((++map.begin(2u))->first);
-    map.erase((++map.begin(15u))->first); // NOLINT
+    map.erase((++map.begin(3u))->first);
 
     ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count);
     ASSERT_EQ(map.size(), 6u);
 
     ASSERT_EQ(map.bucket_size(0u), 2u);
     ASSERT_EQ(map.bucket_size(2u), 2u);
-    ASSERT_EQ(map.bucket_size(15u), 2u);
+    ASSERT_EQ(map.bucket_size(3u), 2u);
 
     ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u));
     ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u + 2u));
-    ASSERT_FALSE(map.contains(2u * minimum_bucket_count * (1u + 1u) - 1u));
+    ASSERT_FALSE(map.contains(2u * minimum_bucket_count * 1u + 3u));
 
-    while(map.begin(15) != map.end(15u)) { // NOLINT
-        map.erase(map.begin(15)->first);   // NOLINT
+    while(map.begin(3) != map.end(3u)) {
+        map.erase(map.begin(3)->first);
     }
 
     ASSERT_EQ(map.bucket_count(), 2u * minimum_bucket_count);
@@ -877,7 +877,7 @@ TEST(DenseMap, EraseFromBucket) {
 
     ASSERT_EQ(map.bucket_size(0u), 2u);
     ASSERT_EQ(map.bucket_size(2u), 2u);
-    ASSERT_EQ(map.bucket_size(15u), 0u);
+    ASSERT_EQ(map.bucket_size(3u), 0u);
 
     ASSERT_TRUE(map.contains(0u * minimum_bucket_count));
     ASSERT_TRUE(map.contains(0u * minimum_bucket_count + 2u));
@@ -892,7 +892,7 @@ TEST(DenseMap, EraseFromBucket) {
 
     ASSERT_EQ(map.bucket_size(0u), 1u);
     ASSERT_EQ(map.bucket_size(2u), 1u);
-    ASSERT_EQ(map.bucket_size(15u), 0u);
+    ASSERT_EQ(map.bucket_size(3u), 0u);
 
     ASSERT_FALSE(map.contains(0u * minimum_bucket_count));
     ASSERT_TRUE(map.contains(0u * minimum_bucket_count + 2u));
diff --git a/test/entt/container/dense_set.cpp b/test/entt/container/dense_set.cpp
index 1c25d1847..16e2ee435 100644
--- a/test/entt/container/dense_set.cpp
+++ b/test/entt/container/dense_set.cpp
@@ -677,7 +677,7 @@ TEST(DenseSet, EraseFromBucket) {
     for(std::size_t next{}; next < 4u; ++next) {
         ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next).second);
         ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next + 2u).second);
-        ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * (next + 1u) - 1u).second);
+        ASSERT_TRUE(set.emplace(2u * minimum_bucket_count * next + 3u).second);
     }
 
     ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count);
@@ -685,7 +685,7 @@ TEST(DenseSet, EraseFromBucket) {
 
     ASSERT_EQ(set.bucket_size(0u), 4u);
     ASSERT_EQ(set.bucket_size(2u), 4u);
-    ASSERT_EQ(set.bucket_size(15u), 4u);
+    ASSERT_EQ(set.bucket_size(3u), 4u);
 
     set.erase(set.end() - 3, set.end());
 
@@ -694,7 +694,7 @@ TEST(DenseSet, EraseFromBucket) {
 
     ASSERT_EQ(set.bucket_size(0u), 3u);
     ASSERT_EQ(set.bucket_size(2u), 3u);
-    ASSERT_EQ(set.bucket_size(15u), 3u);
+    ASSERT_EQ(set.bucket_size(3u), 3u);
 
     for(std::size_t next{}; next < 3u; ++next) {
         ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next));
@@ -703,31 +703,31 @@ TEST(DenseSet, EraseFromBucket) {
         ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next + 2u));
         ASSERT_EQ(set.bucket(2u * minimum_bucket_count * next + 2u), 2u);
 
-        ASSERT_TRUE(set.contains(2u * minimum_bucket_count * (next + 1u) - 1u));
-        ASSERT_EQ(set.bucket(2u * minimum_bucket_count * (next + 1u) - 1u), 15u);
+        ASSERT_TRUE(set.contains(2u * minimum_bucket_count * next + 3u));
+        ASSERT_EQ(set.bucket(2u * minimum_bucket_count * next + 3u), 3u);
     }
 
     ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u));
     ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u + 2u));
-    ASSERT_FALSE(set.contains(2u * minimum_bucket_count * (3u + 1u) - 1u));
+    ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 3u + 3u));
 
     set.erase(*++set.begin(0u));
     set.erase(*++set.begin(2u));
-    set.erase(*++set.begin(15u)); // NOLINT
+    set.erase(*++set.begin(3u));
 
     ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count);
     ASSERT_EQ(set.size(), 6u);
 
     ASSERT_EQ(set.bucket_size(0u), 2u);
     ASSERT_EQ(set.bucket_size(2u), 2u);
-    ASSERT_EQ(set.bucket_size(15u), 2u);
+    ASSERT_EQ(set.bucket_size(3u), 2u);
 
     ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u));
     ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u + 2u));
-    ASSERT_FALSE(set.contains(2u * minimum_bucket_count * (1u + 1u) - 1u));
+    ASSERT_FALSE(set.contains(2u * minimum_bucket_count * 1u + 3u));
 
-    while(set.begin(15) != set.end(15u)) { // NOLINT
-        set.erase(*set.begin(15));         // NOLINT
+    while(set.begin(3) != set.end(3u)) {
+        set.erase(*set.begin(3));
     }
 
     ASSERT_EQ(set.bucket_count(), 2u * minimum_bucket_count);
@@ -735,7 +735,7 @@ TEST(DenseSet, EraseFromBucket) {
 
     ASSERT_EQ(set.bucket_size(0u), 2u);
     ASSERT_EQ(set.bucket_size(2u), 2u);
-    ASSERT_EQ(set.bucket_size(15u), 0u);
+    ASSERT_EQ(set.bucket_size(3u), 0u);
 
     ASSERT_TRUE(set.contains(0u * minimum_bucket_count));
     ASSERT_TRUE(set.contains(0u * minimum_bucket_count + 2u));
@@ -750,7 +750,7 @@ TEST(DenseSet, EraseFromBucket) {
 
     ASSERT_EQ(set.bucket_size(0u), 1u);
     ASSERT_EQ(set.bucket_size(2u), 1u);
-    ASSERT_EQ(set.bucket_size(15u), 0u);
+    ASSERT_EQ(set.bucket_size(3u), 0u);
 
     ASSERT_FALSE(set.contains(0u * minimum_bucket_count));
     ASSERT_TRUE(set.contains(0u * minimum_bucket_count + 2u));