diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
index 27a075a669f77..40af1bdd96c63 100644
--- a/include/swift/Basic/LangOptions.h
+++ b/include/swift/Basic/LangOptions.h
@@ -329,7 +329,9 @@ namespace swift {
 
     /// Whether to enable experimental differentiable programming features:
     /// `@differentiable` declaration attribute, etc.
-    bool EnableExperimentalDifferentiableProgramming = false;
+    // SWIFT_ENABLE_TENSORFLOW
+    // The default on tensorflow branch is true. On master, it is false.
+    bool EnableExperimentalDifferentiableProgramming = true;
 
     /// Whether to enable #quote, #unquote and @quoted.
     bool EnableExperimentalQuasiquotes = false;
diff --git a/unittests/AST/SILAutoDiffIndices.cpp b/unittests/AST/AutoDiffIndexSubset.cpp
similarity index 99%
rename from unittests/AST/SILAutoDiffIndices.cpp
rename to unittests/AST/AutoDiffIndexSubset.cpp
index 0dbaa63ec75d2..0c128a2dfca7d 100644
--- a/unittests/AST/SILAutoDiffIndices.cpp
+++ b/unittests/AST/AutoDiffIndexSubset.cpp
@@ -1,4 +1,4 @@
-//===--- SILAutoDiffIndices.cpp - Tests SILAutoDiffIndices ----------------===//
+//===--- AutoDiffIndexSubset.cpp - Tests AutoDiffIndexSubset --------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/unittests/AST/CMakeLists.txt b/unittests/AST/CMakeLists.txt
index f4a4549cd3a1e..dff55c3fe1828 100644
--- a/unittests/AST/CMakeLists.txt
+++ b/unittests/AST/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_swift_unittest(SwiftASTTests
   ArithmeticEvaluator.cpp
-  DiagnosticConsumerTests.cpp
   # SWIFT_ENABLE_TENSORFLOW
-  SILAutoDiffIndices.cpp
+  AutoDiffIndexSubset.cpp
+  DiagnosticConsumerTests.cpp
   SourceLocTests.cpp
   TestContext.cpp
   TypeMatchTests.cpp