diff --git a/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh b/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
index fd9000e9..8e4bddcd 100644
--- a/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/binop/self_param_binop_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_binop" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_binop() {
   local src='
 using "lang/src/llvm_ir/instructions/binop.hako" as BinOpInst
diff --git a/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh b/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
index 93425838..5f247a02 100644
--- a/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/branch/self_param_branch_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_branch" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_branch() {
   local src='
 using "lang/src/llvm_ir/instructions/branch.hako" as B
diff --git a/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh b/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
index 15890e1a..40d4ac47 100644
--- a/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/compare/self_param_compare_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_compare" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_compare() {
   local src='
 using "lang/src/llvm_ir/instructions/compare.hako" as C
diff --git a/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh b/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
index 08e68be0..179fc35c 100644
--- a/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/const/self_param_const_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_const" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_const() {
   local src='
 using "lang/src/llvm_ir/instructions/const.hako" as ConstInst
diff --git a/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh b/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
index 8fbfb4c7..b75cc876 100644
--- a/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/jump/self_param_jump_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_jump" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_jump() {
   local src='
 using "lang/src/llvm_ir/instructions/jump.hako" as J
diff --git a/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh b/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
index 1d5a0898..683b0e3a 100644
--- a/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/phi/self_param_phi_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_phi" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_phi() {
   local src='
 using "lang/src/llvm_ir/instructions/phi.hako" as PhiInst
diff --git a/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh b/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
index 0aec6e7f..e9cb6080 100644
--- a/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
+++ b/tools/smokes/v2/profiles/quick/core/ret/self_param_ret_vm.sh
@@ -7,6 +7,10 @@ source "$(dirname "$0")/../../../../lib/result_checker.sh"
 require_env || exit 2
 preflight_plugins || exit 2
 
+if [ "${SMOKES_ENABLE_LLVM_SELF_PARAM:-0}" != "1" ]; then
+  test_skip "self_param_ret" "opt-in (set SMOKES_ENABLE_LLVM_SELF_PARAM=1)" && exit 0
+fi
+
 test_self_param_ret() {
   local src='
 using "lang/src/llvm_ir/instructions/ret.hako" as R