diff --git a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTest.Table.al b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTest.Table.al
index e569b82c46..9f4cbf3006 100644
--- a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTest.Table.al	
+++ b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTest.Table.al	
@@ -366,7 +366,7 @@ table 20401 "Qlty. Test"
 
     trigger OnDelete()
     begin
-        CheckDeleteConstraints(false);
+        CheckDeleteConstraints(true);
     end;
 
     procedure CheckDeleteConstraints(AskQuestion: Boolean)
diff --git a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTestCard.Page.al b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTestCard.Page.al
index 3ed7f135f5..bff0a20cc2 100644
--- a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTestCard.Page.al	
+++ b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTestCard.Page.al	
@@ -16,7 +16,6 @@ page 20479 "Qlty. Test Card"
     Caption = 'Quality Test';
     AboutTitle = 'About Quality Test details';
     AboutText = 'Use this page to define questions, measurements, allowed values, and default passing conditions. Add tests to templates to use them in quality inspections.';
-    DeleteAllowed = false;
     PageType = Card;
     SourceTable = "Qlty. Test";
     SourceTableView = sorting(Code);
@@ -545,6 +544,7 @@ page 20479 "Qlty. Test Card"
         }
     }
 
+#if not CLEAN29
     actions
     {
         area(Processing)
@@ -554,6 +554,10 @@ page 20479 "Qlty. Test Card"
                 Caption = 'Delete';
                 Image = Delete;
                 ToolTip = 'Deletes this test. A test can only be deleted if it is not being used on an existing inspection.';
+                Visible = false;
+                ObsoleteState = Pending;
+                ObsoleteReason = 'Deletion is handled by standard page behavior through the OnDelete trigger on Qlty. Test table.';
+                ObsoleteTag = '29.0';
 
                 trigger OnAction()
                 begin
@@ -566,11 +570,17 @@ page 20479 "Qlty. Test Card"
 
         area(Promoted)
         {
+#pragma warning disable AL0432
             actionref(DeleteRecordSafe_Promoted; DeleteRecordSafe)
+#pragma warning restore AL0432
             {
+                ObsoleteState = Pending;
+                ObsoleteReason = 'Deletion is handled by standard page behavior through the OnDelete trigger on Qlty. Test table.';
+                ObsoleteTag = '29.0';
             }
         }
     }
+#endif
 
     var
         QltyResultConditionMgmt: Codeunit "Qlty. Result Condition Mgmt.";
diff --git a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTests.Page.al b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTests.Page.al
index 125107abc7..8123724450 100644
--- a/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTests.Page.al	
+++ b/src/Apps/W1/Quality Management/app/src/Configuration/Template/Test/QltyTests.Page.al	
@@ -20,7 +20,6 @@ page 20401 "Qlty. Tests"
     CardPageId = "Qlty. Test Card";
     Editable = false;
     InsertAllowed = false;
-    DeleteAllowed = false;
     RefreshOnActivate = true;
     PageType = List;
     SourceTable = "Qlty. Test";
@@ -219,6 +218,7 @@ page 20401 "Qlty. Tests"
         }
     }
 
+#if not CLEAN29
     actions
     {
         area(Processing)
@@ -229,6 +229,10 @@ page 20401 "Qlty. Tests"
                 Image = Delete;
                 Scope = Repeater;
                 ToolTip = 'Deletes this test. A test can only be deleted if it is not being used on an existing inspection.';
+                Visible = false;
+                ObsoleteState = Pending;
+                ObsoleteReason = 'Deletion is handled by standard page behavior through the OnDelete trigger on Qlty. Test table.';
+                ObsoleteTag = '29.0';
 
                 trigger OnAction()
                 begin
@@ -238,13 +242,20 @@ page 20401 "Qlty. Tests"
                 end;
             }
         }
+
         area(Promoted)
         {
+#pragma warning disable AL0432
             actionref(DeleteRecordSafe_Promoted; DeleteRecordSafe)
+#pragma warning restore AL0432
             {
+                ObsoleteState = Pending;
+                ObsoleteReason = 'Deletion is handled by standard page behavior through the OnDelete trigger on Qlty. Test table.';
+                ObsoleteTag = '29.0';
             }
         }
     }
+#endif
 
     var
         QltyResultConditionMgmt: Codeunit "Qlty. Result Condition Mgmt.";
@@ -270,11 +281,6 @@ page 20401 "Qlty. Tests"
     begin
     end;
 
-    trigger OnDeleteRecord(): Boolean
-    begin
-        Rec.CheckDeleteConstraints(true);
-    end;
-
     trigger OnAfterGetRecord()
     begin
         UpdateRowData();