diff --git a/polly/lib/Transform/IndependentBlocks.cpp b/polly/lib/Transform/IndependentBlocks.cpp
index 0bebe7cdb65f..c5b2663c4ea8 100644
--- a/polly/lib/Transform/IndependentBlocks.cpp
+++ b/polly/lib/Transform/IndependentBlocks.cpp
@@ -515,6 +515,9 @@ void IndependentBlocks::getAnalysisUsage(AnalysisUsage &AU) const {
 }
 
 bool IndependentBlocks::runOnFunction(llvm::Function &F) {
+  if (DisableIntraScopScalarToArray && PollyModelPHINodes)
+    return false;
+
   bool Changed = false;
 
   RI = &getAnalysis<RegionInfoPass>().getRegionInfo();
@@ -548,6 +551,9 @@ bool IndependentBlocks::runOnFunction(llvm::Function &F) {
 }
 
 void IndependentBlocks::verifyAnalysis() const {
+  if (DisableIntraScopScalarToArray && PollyModelPHINodes)
+    return;
+
   for (const Region *R : *SD)
     verifyScop(R);
 }
diff --git a/polly/test/ScopInfo/phi_scalar_simple_2.ll b/polly/test/ScopInfo/phi_scalar_simple_2.ll
index d42f2a81be7a..8a17f5204bc7 100644
--- a/polly/test/ScopInfo/phi_scalar_simple_2.ll
+++ b/polly/test/ScopInfo/phi_scalar_simple_2.ll
@@ -20,8 +20,8 @@ for.cond:                                         ; preds = %for.inc5, %entry
 ; CHECK: Stmt_for_cond
 ; CHECK:     ReadAccess := [Reduction Type: NONE] [Scalar: 1]
 ; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
-; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
-; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0_s2a[0] };
+; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]
+; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
 ; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
 ; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_A[i0] };
 ; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]