diff --git a/pubspec.yaml b/pubspec.yaml
index b043928..54090a3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,7 +9,7 @@
 dependencies:
   barback: ">=0.9.0 <0.16.0"
   logging: ">=0.9.0 <0.12.0"
-  analyzer: "^0.27.0"
+  analyzer: "^0.29.0"
 # TODO(sigmund): once we have some easier way to do global app-level
 # transformers, we might want to remove this transformer here and only apply it
 # in apps that need it.
@@ -22,8 +22,3 @@
   transformer_test: "^0.2.0"
 environment:
   sdk: ">=1.12.0 <2.0.0"
-dependency_overrides:
-  analyzer:
-    path: /Users/brianwilkerson/src/dart/sdk/sdk/pkg/analyzer
-  front_end:
-    path: /Users/brianwilkerson/src/dart/sdk/sdk/pkg/front_end
diff --git a/test/codegen/testing_resolver_utils.dart b/test/codegen/testing_resolver_utils.dart
index cfba040..ac98a89 100644
--- a/test/codegen/testing_resolver_utils.dart
+++ b/test/codegen/testing_resolver_utils.dart
@@ -32,14 +32,16 @@
     ..preserveComments = false
     ..analyzeFunctionBodies = false;
   analyzer.analysisOptions = options;
-  var manager = new DartSdkManager(null, false);
+  var manager = new DartSdkManager(null, false, (options) {
+    DartSdk sdk = new FolderBasedDartSdk(resourceProvider,
+      resourceProvider.getFolder(testingDartSdkDirectory));
+    sdk.context.analysisOptions = options;
+    return sdk;
+  });
   var sdk = manager.getSdk(
       new SdkDescription([testingDartSdkDirectory], options),
       () => new FolderBasedDartSdk(resourceProvider,
           resourceProvider.getFolder(testingDartSdkDirectory)));
-//  var sdk = new FolderBasedDartSdk(
-//      resourceProvider, resourceProvider.getFolder(testingDartSdkDirectory));
-//  sdk.context.analysisOptions = options;
   var changes = new ChangeSet();
   var allSources = <String, Source>{};
   contents.forEach((url, code) {
diff --git a/test/piece1.dart b/test/piece1.dart
index d8b46cf..2c33301 100644
--- a/test/piece1.dart
+++ b/test/piece1.dart
@@ -5,8 +5,9 @@
 /// Part of the static_in_pieces_test
 library smoke.test.piece1;
 
-import 'package:smoke/smoke.dart' show Declaration, PROPERTY, METHOD;
-import 'package:smoke/static.dart' show useGeneratedCode, StaticConfiguration;
+import 'package:smoke/smoke.dart' show Declaration;
+import 'package:smoke/static.dart' show StaticConfiguration;
+
 import 'common.dart' as smoke_0;
 
 final configuration = new StaticConfiguration(checkedMode: false, getters: {
@@ -22,5 +23,7 @@
     #i: const Declaration(#i, int, annotations: const [smoke_0.a3]),
   },
 }, staticMethods: {
-  smoke_0.A: {#staticInc: smoke_0.A.staticInc,},
+  smoke_0.A: {
+    #staticInc: smoke_0.A.staticInc,
+  },
 }, names: {});
diff --git a/test/piece2.dart b/test/piece2.dart
index 39cb389..15093fa 100644
--- a/test/piece2.dart
+++ b/test/piece2.dart
@@ -5,8 +5,9 @@
 /// Part of the static_in_pieces_test
 library smoke.test.piece2;
 
-import 'package:smoke/smoke.dart' show Declaration, PROPERTY, METHOD;
-import 'package:smoke/static.dart' show useGeneratedCode, StaticConfiguration;
+import 'package:smoke/smoke.dart' show Declaration;
+import 'package:smoke/static.dart' show StaticConfiguration;
+
 import 'common.dart' as smoke_0;
 
 final configuration = new StaticConfiguration(checkedMode: false, getters: {
@@ -17,7 +18,9 @@
   },
 }, parents: {}, declarations: {
   smoke_0.A: {},
-  smoke_0.B: {#a: const Declaration(#a, smoke_0.A),},
+  smoke_0.B: {
+    #a: const Declaration(#a, smoke_0.A),
+  },
   smoke_0.K: {
     #k: const Declaration(#k, int,
         annotations: const [const smoke_0.AnnotC(named: true)]),
@@ -25,7 +28,9 @@
         annotations: const [const smoke_0.AnnotC()]),
   },
 }, staticMethods: {
-  smoke_0.A: {#staticInc: smoke_0.A.staticInc,},
+  smoke_0.A: {
+    #staticInc: smoke_0.A.staticInc,
+  },
 }, names: {
   #i: r'i',
 });