diff --git a/tests/scripts/generate_bignum_tests.py b/tests/scripts/generate_bignum_tests.py
index 493582968e..4ac9210e71 100755
--- a/tests/scripts/generate_bignum_tests.py
+++ b/tests/scripts/generate_bignum_tests.py
@@ -70,8 +70,8 @@ from mbedtls_dev import bignum_core # pylint: disable=unused-import
 
 class BignumTarget(test_data_generation.BaseTarget, metaclass=ABCMeta):
     #pylint: disable=abstract-method
-    """Target for bignum (mpi) test case generation."""
-    target_basename = 'test_suite_mpi.generated'
+    """Target for bignum (legacy) test case generation."""
+    target_basename = 'test_suite_bignum.generated'
 
 
 class BignumOperation(bignum_common.OperationCommon, BignumTarget, metaclass=ABCMeta):
diff --git a/tests/suites/test_suite_mpi.data b/tests/suites/test_suite_bignum.data
similarity index 100%
rename from tests/suites/test_suite_mpi.data
rename to tests/suites/test_suite_bignum.data
diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_bignum.function
similarity index 100%
rename from tests/suites/test_suite_mpi.function
rename to tests/suites/test_suite_bignum.function