diff --git a/tests/yam/agama/agama.pm b/tests/yam/agama/agama.pm
index b7e7e4676060..e2215d2c6abc 100644
--- a/tests/yam/agama/agama.pm
+++ b/tests/yam/agama/agama.pm
@@ -17,12 +17,16 @@ use testapi qw(
 
 sub run {
     my $self = shift;
+
+    my @env_vars = ();
+    push(@env_vars, "AGAMA_DASD=" . get_var('AGAMA_DASD')) if get_var('AGAMA_DASD');
+    push(@env_vars, "AGAMA_PRODUCT=" . get_var('AGAMA_PRODUCT')) if get_var('AGAMA_PRODUCT');
+
     my $test = get_required_var('AGAMA_TEST');
-    my $configure_dasd = get_var('CONFIGURE_DASD');
     my $reboot_page = $testapi::distri->get_reboot_page();
 
     script_run("dmesg --console-off");
-    assert_script_run("CONFIGURE_DASD=$configure_dasd /usr/share/agama/system-tests/" . $test . ".cjs", timeout => 1200);
+    assert_script_run(join(' ', @env_vars) . " /usr/share/agama/system-tests/" . $test . ".cjs", timeout => 1200);
     script_run("dmesg --console-on");
 
     Yam::Agama::agama_base::upload_agama_logs();