Index: lib/Analysis/ScopBuilder.cpp
===================================================================
--- lib/Analysis/ScopBuilder.cpp
+++ lib/Analysis/ScopBuilder.cpp
@@ -115,7 +115,8 @@
                           "Scalar independence heuristic"),
                clEnumValN(GranularityChoice::Stores, "store",
                           "Store-level granularity")),
-    cl::init(GranularityChoice::BasicBlocks), cl::cat(PollyCategory));
+    cl::init(GranularityChoice::ScalarIndependence), cl::cat(PollyCategory),
+    cl::ZeroOrMore);
 
 void ScopBuilder::buildPHIAccesses(ScopStmt *PHIStmt, PHINode *PHI,
                                    Region *NonAffineSubRegion,
Index: test/lit.site.cfg.in
===================================================================
--- test/lit.site.cfg.in
+++ test/lit.site.cfg.in
@@ -59,6 +59,7 @@
                                  + ' -polly-use-llvm-names '
                                  + ' -polly-import-jscop-dir=%S '
                                  + ' -polly-codegen-verify '
+                                 + ' -polly-stmt-granularity=bb '
                                  ))
 
 if config.enable_gpgpu_codegen == 'TRUE' :