diff --git a/analysis_options.yaml b/analysis_options.yaml
index 743c74b..92ae064 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,12 +1,9 @@
-include: package:pedantic/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
     implicit-casts: false
 
-  enable-experiment:
-    - non-nullable
-
 linter:
   rules:
     - avoid_catching_errors
diff --git a/pubspec.yaml b/pubspec.yaml
index 4fe70bc..310675d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -8,8 +8,8 @@
 homepage: https://github.com/dart-lang/path
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dev_dependencies:
-  pedantic: ^1.10.0-nullsafety
-  test: ^1.16.0-nullsafety.4
+  lints: ^1.0.0
+  test: ^1.16.0
diff --git a/test/url_test.dart b/test/url_test.dart
index 96f86b5..16eca4c 100644
--- a/test/url_test.dart
+++ b/test/url_test.dart
@@ -419,8 +419,8 @@
       expect(context.normalize('a/./../b'), 'b');
       expect(context.normalize('a/b/c/../../d/e/..'), 'a/d');
       expect(context.normalize('a/b/../../../../c'), '../../c');
-      expect(context.normalize('z/a/b/../../..\../c'), 'z/..\../c');
-      expect(context.normalize('a/b\c/../d'), 'a/d');
+      expect(context.normalize('z/a/b/../../..../c'), 'z/..../c');
+      expect(context.normalize('a/bc/../d'), 'a/d');
     });
 
     test('does not walk before root on absolute paths', () {
diff --git a/test/windows_test.dart b/test/windows_test.dart
index 1e8c374..e59b207 100644
--- a/test/windows_test.dart
+++ b/test/windows_test.dart
@@ -22,7 +22,7 @@
     expect(context.extension('a/..'), '');
     expect(context.extension('foo.dart'), '.dart');
     expect(context.extension('foo.dart.js'), '.js');
-    expect(context.extension('foo bar\gule fisk.dart.js'), '.js');
+    expect(context.extension('foo bargule fisk.dart.js'), '.js');
     expect(context.extension(r'a.b\c'), '');
     expect(context.extension('a.b/c.d'), '.d');
     expect(context.extension(r'~\.bashrc'), '');