diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c6eb9e607..0d44e0656 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -290,10 +290,12 @@ SETUP_BASIC_TEST(
         entt/entity/view.cpp
 )
 
+# Test entity_no_mixin
+
 SETUP_BASIC_TEST(
     NAME entity_no_mixin
     SOURCES
-        entt/entity/storage_utility.cpp
+        entt/entity_no_mixin/storage_utility.cpp
     DEFS ENTT_NO_MIXIN
 )
 
diff --git a/test/entt/entity/storage_utility.cpp b/test/entt/entity/storage_utility.cpp
index 67c8249a8..d0ea387dd 100644
--- a/test/entt/entity/storage_utility.cpp
+++ b/test/entt/entity/storage_utility.cpp
@@ -14,28 +14,16 @@ TYPED_TEST(StorageUtility, StorageType) {
     using value_type = TestFixture::type;
 
     // just a bunch of static asserts to avoid regressions
-#ifdef ENTT_NO_MIXIN
-    testing::StaticAssertTypeEq<entt::storage_type_t<value_type, entt::entity>, entt::basic_storage<value_type, entt::entity>>();
-    testing::StaticAssertTypeEq<entt::storage_type_t<value_type>, entt::storage<value_type>>();
-#else
     testing::StaticAssertTypeEq<entt::storage_type_t<value_type, entt::entity>, entt::sigh_mixin<entt::basic_storage<value_type, entt::entity>>>();
     testing::StaticAssertTypeEq<entt::storage_type_t<value_type>, entt::sigh_mixin<entt::storage<value_type>>>();
-#endif // ENTT_NO_MIXIN
 }
 
 TYPED_TEST(StorageUtility, StorageFor) {
     using value_type = TestFixture::type;
 
     // just a bunch of static asserts to avoid regressions
-#ifdef ENTT_NO_MIXIN
-    testing::StaticAssertTypeEq<entt::storage_for_t<const value_type, entt::entity>, const entt::basic_storage<value_type, entt::entity>>();
-    testing::StaticAssertTypeEq<entt::storage_for_t<value_type, entt::entity>, entt::basic_storage<value_type, entt::entity>>();
-    testing::StaticAssertTypeEq<entt::storage_for_t<const value_type>, const entt::storage<value_type>>();
-    testing::StaticAssertTypeEq<entt::storage_for_t<value_type>, entt::storage<value_type>>();
-#else
     testing::StaticAssertTypeEq<entt::storage_for_t<const value_type, entt::entity>, const entt::sigh_mixin<entt::basic_storage<value_type, entt::entity>>>();
     testing::StaticAssertTypeEq<entt::storage_for_t<value_type, entt::entity>, entt::sigh_mixin<entt::basic_storage<value_type, entt::entity>>>();
     testing::StaticAssertTypeEq<entt::storage_for_t<const value_type>, const entt::sigh_mixin<entt::storage<value_type>>>();
     testing::StaticAssertTypeEq<entt::storage_for_t<value_type>, entt::sigh_mixin<entt::storage<value_type>>>();
-#endif
 }
diff --git a/test/entt/entity_no_mixin/storage_utility.cpp b/test/entt/entity_no_mixin/storage_utility.cpp
new file mode 100644
index 000000000..bc536cdb4
--- /dev/null
+++ b/test/entt/entity_no_mixin/storage_utility.cpp
@@ -0,0 +1,29 @@
+#include <gtest/gtest.h>
+#include <entt/entity/storage.hpp>
+
+template<typename Type>
+struct StorageUtility: testing::Test {
+    using type = Type;
+};
+
+using StorageUtilityTypes = ::testing::Types<int, char, double, void>;
+
+TYPED_TEST_SUITE(StorageUtility, StorageUtilityTypes, );
+
+TYPED_TEST(StorageUtility, StorageType) {
+    using value_type = TestFixture::type;
+
+    // just a bunch of static asserts to avoid regressions
+    testing::StaticAssertTypeEq<entt::storage_type_t<value_type, entt::entity>, entt::basic_storage<value_type, entt::entity>>();
+    testing::StaticAssertTypeEq<entt::storage_type_t<value_type>, entt::storage<value_type>>();
+}
+
+TYPED_TEST(StorageUtility, StorageFor) {
+    using value_type = TestFixture::type;
+
+    // just a bunch of static asserts to avoid regressions
+    testing::StaticAssertTypeEq<entt::storage_for_t<const value_type, entt::entity>, const entt::basic_storage<value_type, entt::entity>>();
+    testing::StaticAssertTypeEq<entt::storage_for_t<value_type, entt::entity>, entt::basic_storage<value_type, entt::entity>>();
+    testing::StaticAssertTypeEq<entt::storage_for_t<const value_type>, const entt::storage<value_type>>();
+    testing::StaticAssertTypeEq<entt::storage_for_t<value_type>, entt::storage<value_type>>();
+}