diff --git a/.gitignore b/.gitignore
index 388eff0..7dbf035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .pub/
 build/
 packages
+.packages
 
 # Or the files created by dart2js.
 *.dart.js
diff --git a/.status b/.status
deleted file mode 100644
index befa7dd..0000000
--- a/.status
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# Skip non-test files ending with "_test".
-packages/*: Skip
-*/packages/*: Skip
-*/*/packages/*: Skip
-*/*/*/packages/*: Skip
-*/*/*/*packages/*: Skip
-*/*/*/*/*packages/*: Skip
-
-# Only run tests from the build directory, since we don't care about the
-# difference between transformed an untransformed code.
-test/*: Skip
-
-[ $compiler == dart2js || $compiler == dart2dart ]
-build/test/vlq_test: RuntimeError # A VLQ test checks for large numbers that
-                                  # overflow in JS (numbers slightly larger than
-                                  # 32 bits where we do bitwise operations).
diff --git a/.test_config b/.test_config
new file mode 100644
index 0000000..412fc5c
--- /dev/null
+++ b/.test_config
@@ -0,0 +1,3 @@
+{
+  "test_package": true
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index fc0fe9b..86015d5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: source_maps
-version: 0.10.1
+version: 0.10.2-dev
 author: Dart Team <misc@dartlang.org>
 description: Library to programmatically manipulate source map files.
 homepage: http://github.com/dart-lang/source_maps
@@ -9,4 +9,4 @@
 environment:
   sdk: '>=1.8.0 <2.0.0'
 dev_dependencies:
-  unittest: '>=0.9.0 <0.12.0'
+  test: '>=0.12.0 <0.13.0'
diff --git a/test/builder_test.dart b/test/builder_test.dart
index ca0ca8d..dcc583c 100644
--- a/test/builder_test.dart
+++ b/test/builder_test.dart
@@ -5,7 +5,7 @@
 library test.source_maps_test;
 
 import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/source_maps.dart';
 import 'common.dart';
 
diff --git a/test/common.dart b/test/common.dart
index 73a8d40..3bc512c 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -7,7 +7,7 @@
 
 import 'package:source_maps/source_maps.dart';
 import 'package:source_span/source_span.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 /// Content of the source file
 const String INPUT = '''
diff --git a/test/end2end_test.dart b/test/end2end_test.dart
index 7dbc6bd..8caf2e9 100644
--- a/test/end2end_test.dart
+++ b/test/end2end_test.dart
@@ -4,7 +4,7 @@
 
 library test.end2end_test;
 
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/source_maps.dart';
 import 'package:source_span/source_span.dart';
 import 'common.dart';
diff --git a/test/parser_test.dart b/test/parser_test.dart
index b14fdf4..88da8c5 100644
--- a/test/parser_test.dart
+++ b/test/parser_test.dart
@@ -5,7 +5,7 @@
 library test.parser_test;
 
 import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/source_maps.dart';
 import 'common.dart';
 
diff --git a/test/printer_test.dart b/test/printer_test.dart
index e55ca9f..25036ee 100644
--- a/test/printer_test.dart
+++ b/test/printer_test.dart
@@ -5,7 +5,7 @@
 library test.printer_test;
 
 import 'dart:convert';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/source_maps.dart';
 import 'package:source_span/source_span.dart';
 import 'common.dart';
diff --git a/test/refactor_test.dart b/test/refactor_test.dart
index 08b8965..03292d1 100644
--- a/test/refactor_test.dart
+++ b/test/refactor_test.dart
@@ -4,7 +4,7 @@
 
 library polymer.test.refactor_test;
 
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/refactor.dart';
 import 'package:source_maps/parser.dart' show parse, Mapping;
 import 'package:source_span/source_span.dart';
diff --git a/test/run.dart b/test/run.dart
index ec3c3ab..b37fdcd 100755
--- a/test/run.dart
+++ b/test/run.dart
@@ -5,8 +5,8 @@
 
 library test.run;
 
-import 'package:unittest/compact_vm_config.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/compact_vm_config.dart';
+import 'package:test/test.dart';
 import 'dart:io' show Options;
 
 import 'builder_test.dart' as builder_test;
diff --git a/test/utils_test.dart b/test/utils_test.dart
index 79a7de7..cbbb40a 100644
--- a/test/utils_test.dart
+++ b/test/utils_test.dart
@@ -5,7 +5,7 @@
 /// Tests for the binary search utility algorithm.
 library test.utils_test;
 
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/src/utils.dart';
 
 main() {
diff --git a/test/vlq_test.dart b/test/vlq_test.dart
index 0abdc47..d1b543d 100644
--- a/test/vlq_test.dart
+++ b/test/vlq_test.dart
@@ -5,7 +5,7 @@
 library test.vlq_test;
 
 import 'dart:math';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 import 'package:source_maps/src/vlq.dart';
 
 main() {
@@ -49,7 +49,9 @@
     expect(() => decodeVlq('igggggE'.split('').iterator), throws);
     expect(() => decodeVlq('jgggggE'.split('').iterator), throws);
     expect(() => decodeVlq('lgggggE'.split('').iterator), throws);
-  });
+  },
+      // This test uses integers so large they overflow in JS.
+      testOn: "dart-vm");
 }
 
 _checkEncodeDecode(int value) {