diff --git a/paddle/api/test/run_tests.sh b/paddle/api/test/run_tests.sh
index a4814f98f89c2e24195074369bc897b8b4bd2d9b..ff69c45264950db90fbec44c0ab6087994ddeea2 100755
--- a/paddle/api/test/run_tests.sh
+++ b/paddle/api/test/run_tests.sh
@@ -20,11 +20,7 @@ popd > /dev/null
 
 cd $SCRIPTPATH
 
-if [ ! -f ../../dist/*.whl ] ; then  # Swig not compiled.
-  exit 0
-fi
-
-rm .test_env -rf
+rm -rf .test_env
 virtualenv .test_env
 source .test_env/bin/activate
 
diff --git a/paddle/trainer/Tester.cpp b/paddle/trainer/Tester.cpp
index d941a574c0fd443c1f3e01799b5d3d5af1b03c85..6a5b7241a020941fad4321d8e271a1f23467b6ff 100644
--- a/paddle/trainer/Tester.cpp
+++ b/paddle/trainer/Tester.cpp
@@ -66,7 +66,9 @@ Tester::Tester(const std::shared_ptr<TrainerConfigHelper>& config,
 }
 
 void Tester::startTestPeriod() {
-  testDataProvider_->reset();
+  if (testDataProvider_) {
+    testDataProvider_->reset();
+  }
   testEvaluator_->start();
   testContext_.cost = 0;
   testContext_.numSamples = 0;