2 files changed, 2 insertions, 5 deletions
diff --git a/test/CXX/StaticDestructor.cpp b/test/CXX/StaticDestructor.cpp
index 68fb122e..60390c2d 100644
--- a/test/CXX/StaticDestructor.cpp
+++ b/test/CXX/StaticDestructor.cpp
@@ -1,7 +1,7 @@
 // don't optimize this, llvm likes to turn the *p into unreachable
 
 // RUN: %llvmgxx %s -emit-llvm -g -O0 -c -o %t1.bc
-// RUN: %klee --libc=klee --no-output %t1.bc 2> %t1.log
+// RUN: %klee --optimize=false --libc=uclibc --no-output %t1.bc 2> %t1.log
 // RUN: grep ":16: memory error" %t1.log
 
 #include <cassert>
@@ -19,6 +19,6 @@ public:
 
 Test t;
 
-int main() {
+int main(int argc, char** argv) {
   return 0;
 }
diff --git a/test/CXX/dg.exp b/test/CXX/dg.exp
deleted file mode 100644
index 879685ca..00000000
--- a/test/CXX/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]