diff --git a/paddle/fluid/framework/parallel_executor.cc b/paddle/fluid/framework/parallel_executor.cc
index d6129b525c53d21d4343fa695221b09989946e43..289f59d9e44436013d76e355797a9c37afc9d712 100644
--- a/paddle/fluid/framework/parallel_executor.cc
+++ b/paddle/fluid/framework/parallel_executor.cc
@@ -925,6 +925,9 @@ void ParallelExecutor::FeedAndSplitTensorIntoLocalScopes(
                       platform::errors::InvalidArgument(
                           "The feeded number of persistable variables should "
                           "not be less than non-persistable variables"));
+  }
+
+  if (non_persistable_feed_len != -1UL) {
     for (size_t i = 0; i < non_persistable_feed_len; ++i) {
       member_->SetHasFeed(i);
     }
diff --git a/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py b/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py
index 86bf1260dd8608106af3e862959fefecf8ed01ff..7dbb902ba94677b0f662f0f32c3847ea99ddb910 100644
--- a/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py
+++ b/python/paddle/fluid/tests/unittests/test_parallel_executor_inference_feed_partial_data.py
@@ -23,15 +23,18 @@ class TestInferencePartialFeed(unittest.TestCase):
         self.iterations = 10
         self.size = 10
 
-    def run_network(self, places, use_split):
+    def run_network(self, places, use_split, has_persistable):
         startup_prog = fluid.Program()
         main_prog = fluid.Program()
 
         with fluid.program_guard(main_prog, startup_prog):
             x = fluid.data(name='x', shape=[None, self.size], dtype='float32')
             y = fluid.data(name='y', shape=[None, self.size], dtype='float32')
-            lr = fluid.data(name='lr', shape=[1], dtype='float32')
-            lr.persistable = True
+            if has_persistable:
+                lr = fluid.data(name='lr', shape=[1], dtype='float32')
+                lr.persistable = True
+            else:
+                lr = fluid.data(name='lr', shape=[None], dtype='float32')
 
             relu_x = fluid.layers.relu(x)
             relu_y = fluid.layers.relu(y)
@@ -50,7 +53,7 @@ class TestInferencePartialFeed(unittest.TestCase):
             for place_num in six.moves.range(1, len(places) * 3):
                 x_np = gen_random([place_num, self.size])
                 y_np = gen_random([place_num, self.size])
-                if place_num <= len(places):
+                if not lr.persistable or place_num <= len(places):
                     lr_np = gen_random([place_num])
                 else:
                     lr_np = gen_random([1])
@@ -64,7 +67,7 @@ class TestInferencePartialFeed(unittest.TestCase):
 
                 assert_result(x_np, relu_x_np)
                 assert_result(y_np, relu_y_np)
-                if place_num <= len(places):
+                if not lr.persistable or place_num <= len(places):
                     assert_result(lr_np, relu_lr_np)
                 else:
                     expected_relu_lr_np = max(lr_np[0], 0)
@@ -113,8 +116,10 @@ class TestInferencePartialFeed(unittest.TestCase):
             places.append(fluid.cuda_places())
 
         for p in places:
-            self.run_network(p, use_split=True)
-            self.run_network(p, use_split=False)
+            for has_persistable in [False, True]:
+                for use_split in [False, True]:
+                    self.run_network(
+                        p, use_split=use_split, has_persistable=has_persistable)
 
 
 class TestInferencePartialFeedUsingDataLoader(unittest.TestCase):