diff --git a/.travis.yml b/.travis.yml
index 0d83a59..7ccf79c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,43 @@
 language: dart
 dart:
-  - stable
   - dev
 
-dart_task:
-  - test: -p vm
-  - test: -p firefox
-  - dartanalyzer: --fatal-infos --fatal-warnings .
-
-matrix:
+jobs:
   include:
-  # Only validate formatting using the dev release
-  - dart: dev
-    dart_task: dartfmt
+    - stage: analyze_and_format
+      name: "Analyze lib/"
+      dart: dev
+      os: linux
+      script: dartanalyzer --fatal-warnings --fatal-infos lib/
+    # Dirs outside of `lib` are not supported by allowed_experiments.json
+    - stage: analyze_and_format
+      name: "Analyze test/"
+      dart: dev
+      os: linux
+      script: dartanalyzer --enable-experiment=non-nullable --fatal-warnings --fatal-infos test/
+    - stage: analyze_and_format
+      name: "Format"
+      dart: dev
+      os: linux
+      script: dartfmt -n --set-exit-if-changed .
+    - stage: test
+      name: "Vm Tests"
+      dart: dev
+      os: linux
+      script: pub run --enable-experiment=non-nullable test -p vm 
+    - stage: test
+      name: "Web Tests"
+      dart: dev
+      os: linux
+      script: pub run --enable-experiment=non-nullable test -p chrome
+
+stages:
+  - analyze_and_format
+  - test
 
 # Only building master means that we don't run two builds for each pull request.
 branches:
-  only: [master]
+  only: [master, null_safety]
 
 cache:
  directories:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a84e59..a35d3c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
-## 1.2.0-dev
+## 1.3.0-nnbd
+
+* Migrate to NNBD
+
+## 1.2.0
 
 * Add typed queue classes such as `Uint8Queue`. These classes implement both
   `Queue` and `List` with a highly-efficient typed-data-backed implementation.
   Their `sublist()` methods also return typed data classes.
-
 * Update min Dart SDK to `2.4.0`.
 
 ## 1.1.6
diff --git a/pubspec.yaml b/pubspec.yaml
index 02f373b..7bdb374 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,25 +1,21 @@
 name: typed_data
-version: 1.3.0-dev
+version: 1.3.0-nnbd
 
 description: >-
   Utility functions and classes related to the dart:typed_data library.
 homepage: https://github.com/dart-lang/typed_data
 
 environment:
-  sdk: '>=2.9.0-1 <3.0.0'
+  sdk: '>=2.9.0-18.0 <2.9.0'
 
 dependencies:
-  collection: ^1.1.0
+  collection: ^1.15.0-nnbd
 
 dev_dependencies:
   pedantic: ^1.9.0
   test: ^1.0.0
 
-
 dependency_overrides:
-  # test: ^1.12.0
-  # test_api: ^0.2.14
-  # test_core: ^0.3.0
   async:
     git:
       url: git://github.com/dart-lang/async.git
@@ -36,6 +32,11 @@
     git:
       url: git://github.com/dart-lang/collection.git
       ref: null_safety
+  js:
+    git:
+      url: git://github.com/dart-lang/sdk.git
+      ref: null_safety-pkgs
+      path: pkg/js
   matcher:
     git:
       url: git://github.com/dart-lang/matcher.git
@@ -57,6 +58,14 @@
     git:
       url: git://github.com/dart-lang/pool.git
       ref: null_safety
+  source_maps:
+    git:
+      url: git://github.com/dart-lang/source_maps.git
+      ref: null_safety
+  source_map_stack_trace:
+    git:
+      url: git://github.com/dart-lang/source_map_stack_trace.git
+      ref: null_safety
   source_span:
     git:
       url: git://github.com/dart-lang/source_span.git