diff --git a/.gitignore b/.gitignore
index 72b2e8cd1e4..f8621478106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,9 @@ third_party/gsutil/*/gsutilc
 # From the Mac OS X Finder
 .DS_Store
 
-# Pub generated "packages" directories
+# Pub generated "packages" directories and files
 packages
+pubspec.lock
 
 # Vim temporary swap files.
 *.swp
diff --git a/utils/tests/pub/oauth2_test.dart b/utils/tests/pub/oauth2_test.dart
index 42be210807b..560e4a5b297 100644
--- a/utils/tests/pub/oauth2_test.dart
+++ b/utils/tests/pub/oauth2_test.dart
@@ -8,7 +8,6 @@ import 'dart:io';
 import 'dart:json' as json;
 import 'dart:uri';
 
-import 'test_pub.dart';
 import 'test_pub.dart';
 import '../../../pkg/http/lib/http.dart' as http;
 import '../../../pkg/unittest/lib/unittest.dart';
diff --git a/utils/tests/pub/pub_lish_test.dart b/utils/tests/pub/pub_lish_test.dart
index b0faa95f912..e315fff8a40 100644
--- a/utils/tests/pub/pub_lish_test.dart
+++ b/utils/tests/pub/pub_lish_test.dart
@@ -7,7 +7,6 @@ library pub_lish_test;
 import 'dart:io';
 import 'dart:json' as json;
 
-import 'test_pub.dart';
 import 'test_pub.dart';
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/io.dart';
diff --git a/utils/tests/pub/pub_uploader_test.dart b/utils/tests/pub/pub_uploader_test.dart
index 25578457acf..93e1100adac 100644
--- a/utils/tests/pub/pub_uploader_test.dart
+++ b/utils/tests/pub/pub_uploader_test.dart
@@ -7,7 +7,6 @@ library pub_uploader_test;
 import 'dart:io';
 import 'dart:json' as json;
 
-import 'test_pub.dart';
 import 'test_pub.dart';
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../pub/utils.dart';
diff --git a/utils/tests/pub/test_pub.dart b/utils/tests/pub/test_pub.dart
index f9bd96b8c9c..1a480052bd7 100644
--- a/utils/tests/pub/test_pub.dart
+++ b/utils/tests/pub/test_pub.dart
@@ -455,7 +455,7 @@ final _TIMEOUT = 30000;
 
 /// Defines an integration test. The [body] should schedule a series of
 /// operations which will be run asynchronously.
-integration(String description, body()) {
+void integration(String description, void body()) {
   test(description, () {
     body();
     _run();