diff --git a/test/ffmpeg-qsv/encode/av1.py b/test/ffmpeg-qsv/encode/av1.py
index 6df3e323..7dfc0b6b 100644
--- a/test/ffmpeg-qsv/encode/av1.py
+++ b/test/ffmpeg-qsv/encode/av1.py
@@ -5,7 +5,6 @@
 ###
 
 from ....lib import *
-from ....lib.parameters_strapi import *
 from ....lib.ffmpeg.qsv.util import *
 from ....lib.ffmpeg.qsv.encoder import AV1EncoderLPTest, AV1EncoderTest
 from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder
@@ -40,7 +39,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile)
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_cqp_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_cqp_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, qp, quality, profile)
@@ -102,7 +101,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_cbr_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_cbr_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile)
@@ -139,7 +138,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_vbr_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_vbr_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile)
@@ -172,7 +171,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile)
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_cqp_lp_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_cqp_lp_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, qp, quality, profile)
@@ -234,7 +233,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_cbr_lp_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_cbr_lp_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile)
@@ -271,7 +270,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params"))
-  @slash.parametrize(*gen_av1_vbr_lp_strapi_parameters(spec))
+  @slash.parametrize(*gen_av1_vbr_lp_parameters(spec, strapi=True))
   def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile)
diff --git a/test/ffmpeg-qsv/encode/hevc.py b/test/ffmpeg-qsv/encode/hevc.py
index 67899d13..90861ec1 100755
--- a/test/ffmpeg-qsv/encode/hevc.py
+++ b/test/ffmpeg-qsv/encode/hevc.py
@@ -5,7 +5,6 @@
 ###
 
 from ....lib import *
-from ....lib.parameters_strapi import *
 from ....lib.ffmpeg.qsv.util import *
 from ....lib.ffmpeg.qsv.encoder import HEVC8EncoderTest, HEVC8EncoderLPTest
 from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder
@@ -39,11 +38,10 @@ def test_r2r(self, case, gop, slices, bframes, qp, quality, profile):
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_cqp_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_cqp_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, bframes, qp, quality, profile):
      self.EncoderClass = StringAPIEncoder
      self.init(spec, case, gop, slices, bframes, qp, quality, profile)
-     self.EncoderClass = StringAPIEncoder
      self.encode()
 
 class cqp_lp(HEVC8EncoderLPTest):
@@ -71,7 +69,7 @@ def test_r2r(self, case, gop, slices, qp, quality, profile):
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_cqp_lp_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_cqp_lp_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, qp, quality, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, slices, qp, quality, profile)
@@ -105,7 +103,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, profile):
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_cbr_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_cbr_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, bframes, bitrate, fps, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, slices, bframes, bitrate, fps, profile)
@@ -138,7 +136,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, profile):
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_cbr_lp_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_cbr_lp_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, bitrate, fps, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, slices, bitrate, fps, profile)
@@ -174,7 +172,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, quality, refs, prof
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_vbr_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_vbr_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, bframes, bitrate, fps, quality, refs, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, slices, bframes, bitrate, fps, quality, refs, profile)
@@ -212,7 +210,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, quality, refs, profile):
     self.encode()
 
   @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params"))
-  @slash.parametrize(*gen_hevc_vbr_lp_strapi_parameters(spec, ['main']))
+  @slash.parametrize(*gen_hevc_vbr_lp_parameters(spec, ['main'], strapi=True))
   def test_strapi(self, case, gop, slices, bitrate, fps, quality, refs, profile):
     self.EncoderClass = StringAPIEncoder
     self.init(spec, case, gop, slices, bitrate, fps, quality, refs, profile)