diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 134406b1acdb..ac2e3bc402ac 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -185,7 +185,10 @@ fn main() {
 
         // Emit save-analysis info.
         if env::var("RUSTC_SAVE_ANALYSIS") == Ok("api".to_string()) {
-            cmd.arg("-Zsave-analysis-api");
+            cmd.arg("-Zsave-analysis");
+            cmd.env("RUST_SAVE_ANALYSIS_CONFIG",
+                    "{\"output_file\": null,\"full_docs\": false,\"pub_only\": true,\
+                     \"signatures\": false,\"borrow_data\": false}");
         }
 
         // Dealing with rpath here is a little special, so let's go into some
diff --git a/src/test/run-make/save-analysis/Makefile b/src/test/run-make/save-analysis/Makefile
index 9ebc40d4013c..7296fb9cc593 100644
--- a/src/test/run-make/save-analysis/Makefile
+++ b/src/test/run-make/save-analysis/Makefile
@@ -4,4 +4,3 @@ krate2: krate2.rs
 	$(RUSTC) $<
 code: foo.rs krate2
 	$(RUSTC) foo.rs -Zsave-analysis
-	$(RUSTC) foo.rs -Zsave-analysis-api