diff --git a/analysis_options.yaml b/analysis_options.yaml
index 01c74eb9..92df2d33 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -17,5 +17,4 @@ linter:
     - prefer_final_locals
     - prefer_single_quotes
     - test_types_in_equals
-    - use_super_parameters
     - prefer_relative_imports
diff --git a/test/client_certificate_test.dart b/test/client_certificate_test.dart
index 9edde69c..70bb2b98 100644
--- a/test/client_certificate_test.dart
+++ b/test/client_certificate_test.dart
@@ -16,6 +16,8 @@
 // TODO(dartbug.com/26057) currently Mac OS X seems to have some issues with
 // client certificates so we disable the test.
 @TestOn('vm && !mac-os')
+library;
+
 import 'dart:async';
 import 'dart:io';
 
diff --git a/test/client_handles_bad_connections_test.dart b/test/client_handles_bad_connections_test.dart
index 26a6045e..75114d7d 100644
--- a/test/client_handles_bad_connections_test.dart
+++ b/test/client_handles_bad_connections_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 
 import 'package:grpc/grpc.dart' as grpc;
diff --git a/test/client_tests/client_xhr_transport_test.dart b/test/client_tests/client_xhr_transport_test.dart
index 4b3f8587..ece79432 100644
--- a/test/client_tests/client_xhr_transport_test.dart
+++ b/test/client_tests/client_xhr_transport_test.dart
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('browser')
+library;
 
 import 'dart:async';
 import 'dart:html';
diff --git a/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart b/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart
index bffd8ba8..1db9bdad 100644
--- a/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart
+++ b/test/client_tests/grpc_or_grpcweb_channel_grpc_test.dart
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('!browser')
+library;
+
 import 'package:grpc/grpc.dart';
 import 'package:grpc/grpc_or_grpcweb.dart';
 import 'package:test/test.dart';
diff --git a/test/client_tests/grpc_or_grpcweb_channel_web_test.dart b/test/client_tests/grpc_or_grpcweb_channel_web_test.dart
index 77fbe70d..3bd9329d 100644
--- a/test/client_tests/grpc_or_grpcweb_channel_web_test.dart
+++ b/test/client_tests/grpc_or_grpcweb_channel_web_test.dart
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('browser')
+library;
 
 import 'package:grpc/grpc_or_grpcweb.dart';
 import 'package:grpc/grpc_web.dart';
diff --git a/test/connection_server_test.dart b/test/connection_server_test.dart
index 16969c15..d4357736 100644
--- a/test/connection_server_test.dart
+++ b/test/connection_server_test.dart
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('vm')
+library;
 
 import 'dart:async';
 
diff --git a/test/grpc_compression_flag_test.dart b/test/grpc_compression_flag_test.dart
index 97ece918..a41b6995 100644
--- a/test/grpc_compression_flag_test.dart
+++ b/test/grpc_compression_flag_test.dart
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
 
 import 'package:grpc/src/shared/codec.dart';
 import 'package:grpc/src/shared/message.dart';
diff --git a/test/grpc_web_test.dart b/test/grpc_web_test.dart
index fb96f900..dd5fccb6 100644
--- a/test/grpc_web_test.dart
+++ b/test/grpc_web_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('browser')
+library;
+
 import 'dart:async';
 import 'dart:math' as math;
 
diff --git a/test/keepalive_test.dart b/test/keepalive_test.dart
index a63c6086..7ffa1156 100644
--- a/test/keepalive_test.dart
+++ b/test/keepalive_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 
 import 'package:grpc/grpc.dart';
diff --git a/test/options_test.dart b/test/options_test.dart
index c61d82fe..edb3a243 100644
--- a/test/options_test.dart
+++ b/test/options_test.dart
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('vm')
+library;
 
 import 'dart:io';
 
diff --git a/test/proxy_secure_test.dart b/test/proxy_secure_test.dart
index 257103e9..d4deb252 100644
--- a/test/proxy_secure_test.dart
+++ b/test/proxy_secure_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 import 'dart:io';
 
diff --git a/test/proxy_test.dart b/test/proxy_test.dart
index 522d65a6..ec832af4 100644
--- a/test/proxy_test.dart
+++ b/test/proxy_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 
 import 'package:grpc/grpc.dart';
diff --git a/test/round_trip_test.dart b/test/round_trip_test.dart
index 67e3dcfa..5d07fc89 100644
--- a/test/round_trip_test.dart
+++ b/test/round_trip_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 import 'dart:io';
 
diff --git a/test/server_cancellation_test.dart b/test/server_cancellation_test.dart
index ff4cd855..4de5aa28 100644
--- a/test/server_cancellation_test.dart
+++ b/test/server_cancellation_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'package:grpc/grpc.dart';
 import 'package:test/test.dart';
 
diff --git a/test/server_handles_broken_connection_test.dart b/test/server_handles_broken_connection_test.dart
index 38d15ac0..c59c9dad 100644
--- a/test/server_handles_broken_connection_test.dart
+++ b/test/server_handles_broken_connection_test.dart
@@ -14,6 +14,8 @@
 // limitations under the License.
 
 @TestOn('vm')
+library;
+
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
diff --git a/test/server_test.dart b/test/server_test.dart
index 63a957c0..b323f771 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 @TestOn('vm')
+library;
 
 import 'dart:async';
 
diff --git a/test/timeline_test.dart b/test/timeline_test.dart
index c4291980..1866ea5c 100644
--- a/test/timeline_test.dart
+++ b/test/timeline_test.dart
@@ -16,6 +16,8 @@
 @TestOn('vm')
 @Skip(
     'Run only as `dart run --enable-vm-service --timeline-streams=Dart test/timeline_test.dart`')
+library;
+
 import 'dart:async';
 import 'dart:developer' as dev;