diff --git a/paddle/fluid/framework/executor.cc b/paddle/fluid/framework/executor.cc
index b719568c65d5a7c3fa89d30b854141ad95d6fe11..766bf0ab0c1c50146ad3f6e048738209428707b9 100644
--- a/paddle/fluid/framework/executor.cc
+++ b/paddle/fluid/framework/executor.cc
@@ -348,9 +348,6 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
       }
     }
   }
-
-  platform::DeviceContextPool::Instance().Get(place_)->Wait();
-
   if (create_vars && create_local_scope) {
     scope->DeleteScope(local_scope);
   }
diff --git a/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py b/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
index 25dde7b334f667ed26b199be429ded5b7e1901ac..c5b9e92d69133e593a2ce223e83006eda590daa5 100644
--- a/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
+++ b/python/paddle/fluid/tests/unittests/test_cross_entropy_op.py
@@ -15,7 +15,6 @@
 import unittest
 import numpy as np
 from op_test import OpTest, randomize_probability
-import paddle.fluid as fluid
 
 
 class TestCrossEntropyOp1(OpTest):