diff --git a/tests/onnx/test_auto_scan_nonzero.py b/tests/onnx/test_auto_scan_nonzero.py
new file mode 100644
index 0000000000000000000000000000000000000000..9f767e65b77427839b0b917e57c37905697e4b5b
--- /dev/null
+++ b/tests/onnx/test_auto_scan_nonzero.py
@@ -0,0 +1,56 @@
+# Copyright (c) 2022  PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from auto_scan_test import OPConvertAutoScanTest
+from hypothesis import reproduce_failure
+import hypothesis.strategies as st
+import numpy as np
+import unittest
+import random
+
+
+class TestNonZeroConcert(OPConvertAutoScanTest):
+    """
+    ONNX op: NonZero
+    OPset version: 9~15
+    """
+
+    def sample_convert_config(self, draw):
+        input_shape = draw(
+            st.lists(
+                st.integers(
+                    min_value=10, max_value=20), min_size=1, max_size=3))
+        input_dtype = draw(st.sampled_from(["float32", "int32"]))
+
+        config = {
+            "op_names": ["NonZero", ],
+            "test_data_shapes": [input_shape],
+            "test_data_types": [input_dtype],
+            "inputs_shape": [input_shape],
+            "min_opset_version": 9,
+            "inputs_name": ["x"],
+            "outputs_name": ["y"],
+            "delta": 1e-4,
+            "rtol": 1e-4,
+            "run_dynamic": True,
+        }
+        attrs = {}
+        return (config, attrs)
+
+    def test(self):
+        self.run_and_statis(max_examples=50)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/x2paddle/op_mapper/onnx2paddle/opset_legacy.py b/x2paddle/op_mapper/onnx2paddle/opset_legacy.py
index 5f39b35c603c2d25387216f28dff7500b4c49fa3..cac210db258eaf61ca7dc96b0a1a5daa17c6022c 100644
--- a/x2paddle/op_mapper/onnx2paddle/opset_legacy.py
+++ b/x2paddle/op_mapper/onnx2paddle/opset_legacy.py
@@ -1946,9 +1946,12 @@ class OpSet():
             "paddle.nonzero",
             inputs={"x": val_x.name},
             outputs=[val_x.name],
-            as_tuple=True)
+            as_tuple=False)
         self.paddle_graph.add_layer(
-            "paddle.concat", inputs={"x": val_x.name}, outputs=[node.name])
+            'paddle.transpose',
+            inputs={"x": val_x.name},
+            outputs=[node.name],
+            perm=[1, 0])
 
     @print_mapping_info
     def Identity(self, node):