diff --git a/mace/ops/buffer_to_image_benchmark.cc b/mace/ops/buffer_to_image_benchmark.cc
index d4e687b846f340cddbaf4cd3b50854f326b6eb44..8249c344bb4c7fed189aeae4afee3f42fce6c70c 100644
--- a/mace/ops/buffer_to_image_benchmark.cc
+++ b/mace/ops/buffer_to_image_benchmark.cc
@@ -50,8 +50,6 @@ void FilterBufferToImage(int iters,
                    b2i_output);
   };
 
-  // Warm-up
-  net.Setup(D);
   for (int i = 0; i < 5; ++i) {
     transform_func();
   }
diff --git a/mace/ops/ops_test_util.cc b/mace/ops/ops_test_util.cc
index dec3bd50db64468a5ee566c2b8fa2d63b50f2231..25de146a59db15f456a0941c14222fc30a5a54e7 100644
--- a/mace/ops/ops_test_util.cc
+++ b/mace/ops/ops_test_util.cc
@@ -188,15 +188,17 @@ bool OpsTestNet::Setup(mace::DeviceType device) {
       }
     }
   }
-  auto op_def = op_defs_.back();
-  for (int i = 0; i < op_def.output_size(); ++i) {
-    ws_.RemoveTensor(op_def.output(i));
-    auto output_info = net_def.add_output_info();
-    output_info->set_name(op_def.output(i));
-    if (op_def.output_type_size() == op_def.output_size()) {
-      output_info->set_data_type(op_def.output_type(i));
-    } else {
-      output_info->set_data_type(DataType::DT_FLOAT);
+  if (!op_defs_.empty()) {
+    auto op_def = op_defs_.back();
+    for (int i = 0; i < op_def.output_size(); ++i) {
+      ws_.RemoveTensor(op_def.output(i));
+      auto output_info = net_def.add_output_info();
+      output_info->set_name(op_def.output(i));
+      if (op_def.output_type_size() == op_def.output_size()) {
+        output_info->set_data_type(op_def.output_type(i));
+      } else {
+        output_info->set_data_type(DataType::DT_FLOAT);
+      }
     }
   }
   MemoryOptimizer mem_optimizer;