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 e9f2b00..0000000
--- a/.status
+++ /dev/null
@@ -1,3 +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.
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 ffd4ccc..16477be 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: string_scanner
-version: 0.1.3+1
+version: 0.1.4-dev
 author: "Dart Team <misc@dartlang.org>"
 homepage: https://github.com/dart-lang/string_scanner
 description: >
@@ -8,6 +8,6 @@
   path: ">=1.2.0 <2.0.0"
   source_span: ">=1.0.0 <2.0.0"
 dev_dependencies:
-  unittest: ">=0.10.0 <0.12.0"
+  test: ">=0.12.0 <0.13.0"
 environment:
   sdk: ">=1.2.0 <2.0.0"
diff --git a/test/error_test.dart b/test/error_test.dart
index d7b81e8..9c485e5 100644
--- a/test/error_test.dart
+++ b/test/error_test.dart
@@ -5,7 +5,7 @@
 library string_scanner.error_test;
 
 import 'package:string_scanner/string_scanner.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 import 'utils.dart';
 
diff --git a/test/line_scanner_test.dart b/test/line_scanner_test.dart
index 8cc79a6..83222d6 100644
--- a/test/line_scanner_test.dart
+++ b/test/line_scanner_test.dart
@@ -5,7 +5,7 @@
 library string_scanner.line_scanner_test;
 
 import 'package:string_scanner/string_scanner.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 void main() {
   var scanner;
diff --git a/test/span_scanner_test.dart b/test/span_scanner_test.dart
index 796df29..a6249b7 100644
--- a/test/span_scanner_test.dart
+++ b/test/span_scanner_test.dart
@@ -5,7 +5,7 @@
 library string_scanner.span_scanner_test;
 
 import 'package:string_scanner/string_scanner.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 void main() {
   var scanner;
diff --git a/test/string_scanner_test.dart b/test/string_scanner_test.dart
index 7b00796..c8e43a5 100644
--- a/test/string_scanner_test.dart
+++ b/test/string_scanner_test.dart
@@ -5,7 +5,7 @@
 library string_scanner.string_scanner_test;
 
 import 'package:string_scanner/string_scanner.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('with an empty string', () {
diff --git a/test/utils.dart b/test/utils.dart
index 3de601c..8df4b51 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -5,7 +5,7 @@
 library string_scanner.test.utils;
 
 import 'package:string_scanner/string_scanner.dart';
-import 'package:unittest/unittest.dart';
+import 'package:test/test.dart';
 
 /// Returns a matcher that asserts that a closure throws a [FormatException]
 /// with the given [message].