diff --git a/cpp/src/Slice/MetadataValidation.cpp b/cpp/src/Slice/MetadataValidation.cpp
index 6069baa23f4..87b93e99ad8 100644
--- a/cpp/src/Slice/MetadataValidation.cpp
+++ b/cpp/src/Slice/MetadataValidation.cpp
@@ -123,7 +123,7 @@ Slice::validateMetadata(const UnitPtr& p, string_view prefix, map<string, Metada
     MetadataInfo suppressWarningInfo = {
         {typeid(Unit)},
         MetadataArgumentKind::AnyNumberOfArguments,
-        {{"all", "deprecated", "invalid-metadata", "invalid-comment"}},
+        {{"all", "deprecated", "invalid-comment"}},
     };
     suppressWarningInfo.mustBeUnique = false;
     knownMetadata.emplace("suppress-warning", std::move(suppressWarningInfo));
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 135f54181b7..e42dd631712 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -278,10 +278,6 @@ Slice::DefinitionContext::initSuppressedWarnings()
                 {
                     _suppressedWarnings.insert(Deprecated);
                 }
-                else if (s == "invalid-metadata")
-                {
-                    _suppressedWarnings.insert(InvalidMetadata);
-                }
                 else if (s == "invalid-comment")
                 {
                     _suppressedWarnings.insert(InvalidComment);
diff --git a/cpp/test/Ice/defaultValue/Test.ice b/cpp/test/Ice/defaultValue/Test.ice
index c8cefe0282c..d87d6729db6 100644
--- a/cpp/test/Ice/defaultValue/Test.ice
+++ b/cpp/test/Ice/defaultValue/Test.ice
@@ -1,6 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.err b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.err
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.ice
deleted file mode 100644
index 0370c5cd034..00000000000
--- a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.ice
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) ZeroC, Inc.
-
-[["suppress-warning:invalid-metadata"]]
-
-// Duplicate metadata should be rejected.
-[["cpp:header-ext:hh"]]
-[["cpp:header-ext:hh"]]
-[["cpp:source-ext:cc"]]
-[["cpp:source-ext:cc"]]
-[["cpp:dll-export:Test"]]
-[["cpp:dll-export:Test"]]
-
-// Duplicate metadata should be rejected, and this is missing a required argument.
-[["cpp:header-ext"]]
-[["cpp:header-ext:"]]
-[["cpp:source-ext"]]
-[["cpp:source-ext:"]]
-[["cpp:dll-export"]]
-[["cpp:dll-export:"]]
-
-// It's okay for this metadata to appear multiple times, but it's missing a required argument.
-[["cpp:include"]]
-[["cpp:include:"]]
-
-// Unknown file metadata is disallowed.
-[["unknown"]]
-[["cpp:unknown"]]
-[["bad:unknown"]]
-// Ignore metadata that has a valid language prefix, but that doesn't match the current compiler.
-[["php:unknown"]]
-
-// Passing an argument to metadata that doesn't take arguments is disallowed.
-[["cpp:no-default-include:foo"]]
-
-// The 'amd' metadata cannot be used as file-level metadata.
-[["amd"]]
-
-module Test
-{
-
-// The 'cpp:header-ext' metadata cannot be used as local metadata. It also cannot take multiple arguments.
-["cpp:header-ext:a, b, c"]
-sequence<byte> Blob;
-
-// Providing a message to 'deprecated' is optional, but it cannot be applied twice to the same thing.
-["deprecated", "deprecated:do not use this"]
-class Container
-{
-    // Unknown local metadata is disallowed.
-    ["unknown", "cpp:unknown", "bad:unknown"]
-    bool b;
-
-    // Ignore metadata that has a valid language prefix, but that doesn't match the current compiler.
-    ["php:unknown"]
-    int i;
-
-    // Passing an argument to metadata that doesn't take arguments is disallowed.
-    ["protected:foo", "cpp:array:foo"]
-    Blob blob;
-}
-
-interface I
-{
-    ["cpp:type:std::list<::std::string>"]
-    void op1();
-
-    ["cpp:array"]
-    void op2();
-
-    void op3(["cpp:type:my_string"] string s);
-
-    void op4(["cpp:view-type:my_string"] string s);
-
-    // Certain metadata restrict what arguments are valid; 'something' is not a valid format.
-    // It is also disallowed to pass multiple arguments to metadata which only expects one.
-    // And this will also trigger a duplicate metadata warning. All 3 warnings should be emitted from this.
-    ["format:something", "format:default, sliced"]
-    void op5();
-}
-
-["cpp:const", "cpp:ice_print"]
-struct S
-{
-    int i;
-}
-
-["cpp:virtual"]
-exception E
-{
-}
-
-["bad", "cpp:nope", "java:bad"] // We skip metadata that has a valid (but inapplicable) language prefix.
-class C
-{
-}
-
-["cpp98:foo", "cpp11:bar"] // We still warn for unknown language prefixes (cpp98 and cpp11 metadata were removed in 3.8)
-class P
-{
-}
-
-}
diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice
index 37abde3e015..af79588eaec 100644
--- a/cpp/test/Slice/escape/Key.ice
+++ b/cpp/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {
diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice
index e7a780cddcc..ea3f49d866a 100644
--- a/csharp/test/Ice/defaultValue/Test.ice
+++ b/csharp/test/Ice/defaultValue/Test.ice
@@ -1,15 +1,10 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress warnings
-//
-[["suppress-warning:invalid-metadata, deprecated"]]
-["cs:namespace:Ice.defaultValue"]
+[["suppress-warning:deprecated"]] // For enumerator references
 
+["cs:namespace:Ice.defaultValue"]
 module Test
 {
 
diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice
index 320f42d3da7..ed4e27ff6f3 100644
--- a/csharp/test/Ice/stream/Test.ice
+++ b/csharp/test/Ice/stream/Test.ice
@@ -1,13 +1,9 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata"]]
+// Suppress invalid metadata warnings which we expect this test to generate.
+[["suppress-warning"]]
 
 #include "Ice/BuiltinSequences.ice"
 
diff --git a/csharp/test/Slice/escape/Key.ice b/csharp/test/Slice/escape/Key.ice
index 07489d5f413..915ed11cc03 100644
--- a/csharp/test/Slice/escape/Key.ice
+++ b/csharp/test/Slice/escape/Key.ice
@@ -1,10 +1,7 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-[["suppress-warning:deprecated"]]
 module abstract
 {
 
diff --git a/java/test/src/main/java/test/Slice/escape/Key.ice b/java/test/src/main/java/test/Slice/escape/Key.ice
index 944c318e3f1..2c05fe4c958 100644
--- a/java/test/src/main/java/test/Slice/escape/Key.ice
+++ b/java/test/src/main/java/test/Slice/escape/Key.ice
@@ -1,10 +1,9 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-[["java:package:test.Slice.escape", "suppress-warning:deprecated"]]
+[["java:package:test.Slice.escape"]]
+
 module abstract
 {
 
diff --git a/js/test/Ice/stream/Test.ice b/js/test/Ice/stream/Test.ice
index 3025f96a28e..faff7ea6bd9 100644
--- a/js/test/Ice/stream/Test.ice
+++ b/js/test/Ice/stream/Test.ice
@@ -1,14 +1,7 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata, deprecated"]]
-
 #include "Ice/BuiltinSequences.ice"
 
 module Test
diff --git a/php/test/Slice/escape/Key.ice b/php/test/Slice/escape/Key.ice
index a3e5a4dee28..5bcffb4cedf 100644
--- a/php/test/Slice/escape/Key.ice
+++ b/php/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {
diff --git a/python/test/Slice/escape/Key.ice b/python/test/Slice/escape/Key.ice
index fdff1db3eb0..cb538287f49 100644
--- a/python/test/Slice/escape/Key.ice
+++ b/python/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {
diff --git a/ruby/test/Slice/escape/Key.ice b/ruby/test/Slice/escape/Key.ice
index 116fd417477..c55f3ed254c 100644
--- a/ruby/test/Slice/escape/Key.ice
+++ b/ruby/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module BEGIN
 {
diff --git a/swift/test/Ice/proxy/Test.ice b/swift/test/Ice/proxy/Test.ice
index 19cfa488789..065d1c3d4e5 100644
--- a/swift/test/Ice/proxy/Test.ice
+++ b/swift/test/Ice/proxy/Test.ice
@@ -1,10 +1,9 @@
 // Copyright (c) ZeroC, Inc.
+
 #pragma once
 
 #include "Ice/Context.ice"
 
-[["suppress-warning:deprecated"]]
-
 module Test
 {
 
diff --git a/swift/test/Ice/stream/Test.ice b/swift/test/Ice/stream/Test.ice
index 8deccdef4f5..d9a55548a22 100644
--- a/swift/test/Ice/stream/Test.ice
+++ b/swift/test/Ice/stream/Test.ice
@@ -1,13 +1,9 @@
 // Copyright (c) ZeroC, Inc.
+
 #pragma once
 
 #include "Ice/BuiltinSequences.ice"
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata"]]
-
 [["swift:class-resolver-prefix:IceStrem"]]
 module Test
 {
diff --git a/swift/test/Slice/escape/Key.ice b/swift/test/Slice/escape/Key.ice
index 277a40e4273..db5b7f20d64 100644
--- a/swift/test/Slice/escape/Key.ice
+++ b/swift/test/Slice/escape/Key.ice
@@ -1,5 +1,4 @@
 // Copyright (c) ZeroC, Inc.
-[["suppress-warning:deprecated"]]
 
 module and
 {