diff --git a/product/ERP5Catalog/tests/testERP5CatalogSecurityUidOptimization.py b/bt5/erp5_security_uid_innodb_catalog/TestTemplateItem/portal_components/test.erp5.testERP5CatalogSecurityUidOptimization.py
similarity index 100%
rename from product/ERP5Catalog/tests/testERP5CatalogSecurityUidOptimization.py
rename to bt5/erp5_security_uid_innodb_catalog/TestTemplateItem/portal_components/test.erp5.testERP5CatalogSecurityUidOptimization.py
diff --git a/bt5/erp5_security_uid_innodb_catalog/TestTemplateItem/portal_components/test.erp5.testERP5CatalogSecurityUidOptimization.xml b/bt5/erp5_security_uid_innodb_catalog/TestTemplateItem/portal_components/test.erp5.testERP5CatalogSecurityUidOptimization.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6625ac4b4b450b4162e579b707ae7816679688d5
--- /dev/null
+++ b/bt5/erp5_security_uid_innodb_catalog/TestTemplateItem/portal_components/test.erp5.testERP5CatalogSecurityUidOptimization.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5CatalogSecurityUidOptimization</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5Catalog.tests.testERP5CatalogSecurityUidOptimization</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5CatalogSecurityUidOptimization</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_security_uid_innodb_catalog/bt/template_test_id_list b/bt5/erp5_security_uid_innodb_catalog/bt/template_test_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..0c7e2d06de12c88e8d09de5fa25e88cba9ad4c26
--- /dev/null
+++ b/bt5/erp5_security_uid_innodb_catalog/bt/template_test_id_list
@@ -0,0 +1 @@
+test.erp5.testERP5CatalogSecurityUidOptimization
\ No newline at end of file
diff --git a/bt5/erp5_security_uid_innodb_catalog/bt/test_dependency_list b/bt5/erp5_security_uid_innodb_catalog/bt/test_dependency_list
new file mode 100644
index 0000000000000000000000000000000000000000..8149202de5a0fdbfef09dbb29ca4eb3ed702ac94
--- /dev/null
+++ b/bt5/erp5_security_uid_innodb_catalog/bt/test_dependency_list
@@ -0,0 +1,2 @@
+erp5_full_text_mroonga_catalog
+erp5_base
\ No newline at end of file