diff --git a/tests/schema_evolution/code_gen/CMakeLists.txt b/tests/schema_evolution/code_gen/CMakeLists.txt
index 989e37cd0..05c46ee6e 100644
--- a/tests/schema_evolution/code_gen/CMakeLists.txt
+++ b/tests/schema_evolution/code_gen/CMakeLists.txt
@@ -5,6 +5,7 @@ ADD_SCHEMA_EVOLUTION_TEST(datatypes_new_member)
 ADD_SCHEMA_EVOLUTION_TEST(implicit_floating_point_change)
 ADD_SCHEMA_EVOLUTION_TEST(components_rename_member WITH_EVOLUTION)
 ADD_SCHEMA_EVOLUTION_TEST(datatypes_rename_member WITH_EVOLUTION)
+ADD_SCHEMA_EVOLUTION_TEST(rename_datatype)
 
 # RNTuple support for schema evolution capabilities is version dependent
 if(ENABLE_RNTUPLE AND ROOT_VERSION VERSION_GREATER_EQUAL 6.34)
diff --git a/tests/schema_evolution/code_gen/rename_datatype/check.cpp b/tests/schema_evolution/code_gen/rename_datatype/check.cpp
new file mode 100644
index 000000000..5060c6fee
--- /dev/null
+++ b/tests/schema_evolution/code_gen/rename_datatype/check.cpp
@@ -0,0 +1,14 @@
+#ifdef PODIO_SCHEMA_EVOLUTION_TEST_WRITE
+  #include <datamodel/OldTestTypeCollection.h>
+#else
+  #include <datamodel/NewTestTypeCollection.h>
+#endif
+
+#include "check_base.h"
+
+int main() {
+  WRITE_AS(OldTestTypeCollection, { elem.i(42); });
+
+  READ_AS(NewTestTypeCollection,
+          { ASSERT_EQUAL(elem.i(), 42, "Member of renamed type does not have the expected content"); });
+}
diff --git a/tests/schema_evolution/code_gen/rename_datatype/new.yaml b/tests/schema_evolution/code_gen/rename_datatype/new.yaml
new file mode 100644
index 000000000..4c0a79314
--- /dev/null
+++ b/tests/schema_evolution/code_gen/rename_datatype/new.yaml
@@ -0,0 +1,10 @@
+schema_version: 2
+options:
+  includeSubfolder: true
+
+datatypes:
+  NewTestType:
+    Description: "A datatype that will be renamed"
+    Author: "Thomas Madlener"
+    Members:
+      - int i // an int
diff --git a/tests/schema_evolution/code_gen/rename_datatype/old.yaml b/tests/schema_evolution/code_gen/rename_datatype/old.yaml
new file mode 100644
index 000000000..32e02f3a7
--- /dev/null
+++ b/tests/schema_evolution/code_gen/rename_datatype/old.yaml
@@ -0,0 +1,10 @@
+schema_version: 1
+options:
+  includeSubfolder: true
+
+datatypes:
+  OldTestType:
+    Description: "A datatype that will be renamed"
+    Author: "Thomas Madlener"
+    Members:
+      - int i // an int