Index: clang/test/Analysis/PR24184.cpp
===================================================================
--- clang/test/Analysis/PR24184.cpp
+++ clang/test/Analysis/PR24184.cpp
@@ -1,6 +1,10 @@
-// UNSUPPORTED: z3
-// RUN: %clang_analyze_cc1 -w -fcxx-exceptions -analyzer-checker=core -analyzer-checker=alpha.core.PointerArithm,alpha.core.CastToStruct -analyzer-max-loop 64 -verify %s
-// RUN: %clang_analyze_cc1 -w -analyzer-checker=core -analyzer-checker=cplusplus -fcxx-exceptions -analyzer-checker alpha.core.PointerArithm,alpha.core.CastToStruct -analyzer-max-loop 63 -verify %s
+// RUN: %clang_cc1 -w -fcxx-exceptions -analyzer-max-loop 64 -verify %s \
+// RUN:   -analyze -analyzer-constraints=range -setup-static-analyzer \
+// RUN:   -analyzer-checker=core,alpha.core.PointerArithm,alpha.core.CastToStruct
+//
+// RUN: %clang_cc1 -w -fcxx-exceptions -analyzer-max-loop 63 -verify %s \
+// RUN:   -analyze -analyzer-constraints=range -setup-static-analyzer \
+// RUN:   -analyzer-checker=core,alpha.core.PointerArithm,alpha.core.CastToStruct,cplusplus
 
 // These tests used to hit an assertion in the bug report. Test case from http://llvm.org/PR24184.
 typedef struct {