diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
index 9721da54b360..14ef93142144 100644
--- a/include/swift/Basic/Features.def
+++ b/include/swift/Basic/Features.def
@@ -536,7 +536,7 @@ EXPERIMENTAL_FEATURE(ImportMacroAliases, true)
 EXPERIMENTAL_FEATURE(BorrowAndMutateAccessors, false)
 
 /// Allow use of @inline(always) attribute
-SUPPRESSIBLE_EXPERIMENTAL_FEATURE(InlineAlways, false)
+SUPPRESSIBLE_LANGUAGE_FEATURE(InlineAlways, 496, "@inline(always) attribute")
 
 /// Allow use of 'Swift' (Swift runtime version) in @available attributes
 EXPERIMENTAL_FEATURE(SwiftRuntimeAvailability, true)
diff --git a/test/ModuleInterface/attr-inline-always.swift b/test/ModuleInterface/attr-inline-always.swift
index c5d24654b780..9fc3522c7c7b 100644
--- a/test/ModuleInterface/attr-inline-always.swift
+++ b/test/ModuleInterface/attr-inline-always.swift
@@ -2,10 +2,19 @@
 // RUN:  -enable-experimental-feature InlineAlways \
 // RUN:  -emit-private-module-interface-path %t.private.swiftinterface
 
-// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name attrs \
-// RUN:  -enable-experimental-feature InlineAlways
-// RUN: %target-swift-typecheck-module-from-interface(%t.private.swiftinterface) -module-name attrs \
-// RUN:  -enable-experimental-feature InlineAlways
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name attrs
+
+// RUN: %target-swift-typecheck-module-from-interface(%t.private.swiftinterface) -module-name attrs
+
+// RUN: %FileCheck %s --check-prefixes CHECK --input-file %t.swiftinterface
+// RUN: %FileCheck %s --check-prefixes CHECK --input-file %t.private.swiftinterface
+
+// RUN: %target-swift-emit-module-interface(%t.swiftinterface) %s -module-name attrs \
+// RUN:  -emit-private-module-interface-path %t.private.swiftinterface
+
+// RUN: %target-swift-typecheck-module-from-interface(%t.swiftinterface) -module-name attrs
+
+// RUN: %target-swift-typecheck-module-from-interface(%t.private.swiftinterface) -module-name attrs
 
 // RUN: %FileCheck %s --check-prefixes CHECK --input-file %t.swiftinterface
 // RUN: %FileCheck %s --check-prefixes CHECK --input-file %t.private.swiftinterface
diff --git a/test/SILGen/inline_always.swift b/test/SILGen/inline_always.swift
index 9fa11c0573cf..6e420d2106e7 100644
--- a/test/SILGen/inline_always.swift
+++ b/test/SILGen/inline_always.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-emit-silgen -enable-experimental-feature InlineAlways -parse-as-library %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen -parse-as-library %s | %FileCheck %s
 
 // REQUIRES: swift_feature_InlineAlways