diff --git a/test/smoke_test/cas_functions b/test/smoke_test/cas_functions
index 0709c06..3b497e1 100644
--- a/test/smoke_test/cas_functions
+++ b/test/smoke_test/cas_functions
@@ -30,8 +30,11 @@ restore_config() {
 start_cache() {
     check_options ${FUNCNAME[0]}
 
-    local COMMAND="$CAS --start-cache --cache-device $CACHE_DEVICE_OPTION --cache-id $CACHE_ID_OPTION"
+    local COMMAND="$CAS --start-cache --cache-device $CACHE_DEVICE_OPTION"
 
+    if [ -n "$CACHE_ID_OPTION" ] ; then
+        COMMAND="$COMMAND --cache-id $CACHE_ID_OPTION"
+    fi
     if [ -n "$CACHE_FORCE_OPTION" ] ; then
         COMMAND="$COMMAND --force"
     fi
diff --git a/test/smoke_test/cas_options b/test/smoke_test/cas_options
index f376de4..d17b680 100644
--- a/test/smoke_test/cas_options
+++ b/test/smoke_test/cas_options
@@ -33,7 +33,7 @@ export ALL_OPTIONS="
 # Specify ONLY required options here. The name of the variable should start with
 # uppercase function's name + "_REQUIRED_OPTIONS".
 
-export START_CACHE_REQUIRED_OPTIONS="CACHE_ID_OPTION CACHE_DEVICE_OPTION"
+export START_CACHE_REQUIRED_OPTIONS="CACHE_DEVICE_OPTION"
 export STOP_CACHE_REQUIRED_OPTIONS="CACHE_ID_OPTION"
 export ADD_CORE_REQUIRED_OPTIONS="CACHE_ID_OPTION CORE_DEVICE_OPTION"
 export TRY_ADD_CORE_REQUIRED_OPTIONS="CACHE_ID_OPTION CORE_ID_OPTION CORE_DEVICE_OPTION"
@@ -67,7 +67,6 @@ export TURN_ON_NVME_DEVICE_REQUIRED_OPTIONS="CACHE_DEVICE_OPTION"
 
 export START_DUAL_LEVEL_CACHE_REQUIRED_OPTIONS="CACHE_ID_OPTION CACHE_DEVICE_OPTION"
 
-export START_CACHE_REQUIRED_OPTIONS="CACHE_ID_OPTION CACHE_DEVICE_OPTION"
 
 export IO_CLASS_LIST_REQUIRED_OPTIONS="CACHE_ID_OPTION"
 export IO_CLASS_LOAD_REQUIRED_OPTIONS="CACHE_ID_OPTION CSV_FILE"
diff --git a/test/smoke_test/incremental_load/01 b/test/smoke_test/incremental_load/01
index a94d011..70ae000 100755
--- a/test/smoke_test/incremental_load/01
+++ b/test/smoke_test/incremental_load/01
@@ -57,7 +57,7 @@ DEVICE_ID_OPTION="${CORE_DEVICE}-part3" DEMANDED_STATE_OPTION="Detached" check_d
 
 
 # Try to load cache device, check if it is running and if all cores status is appropirate
-CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
+CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
 DEVICE_ID_OPTION="${CACHE_DEVICE}-part1" DEMANDED_STATE_OPTION="Running" check_device_state
 DEVICE_ID_OPTION="${DEVICE_NAME}1-1" DEMANDED_STATE_OPTION="Active" check_device_state
 DEVICE_ID_OPTION="${DEVICE_NAME}1-2" DEMANDED_STATE_OPTION="Active" check_device_state
diff --git a/test/smoke_test/incremental_load/02 b/test/smoke_test/incremental_load/02
index 72754f7..78ed23f 100755
--- a/test/smoke_test/incremental_load/02
+++ b/test/smoke_test/incremental_load/02
@@ -48,7 +48,7 @@ TARGET_DEVICE_OPTION="$CORE_DEVICE" PARTITION_SIZE_OPTION="4000M" PARTITION_IDS_
 sleep 1
 # Load cache, then add cores and check if chache is running
 # Try to load cache device, check its state and cores state
-CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
+CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
 DEVICE_ID_OPTION="${CACHE_DEVICE}-part1" DEMANDED_STATE_OPTION="Incomplete" check_device_state
 DEVICE_ID_OPTION="${DEVICE_NAME}1-1" DEMANDED_STATE_OPTION="Active" check_device_state
 DEVICE_ID_OPTION="${DEVICE_NAME}1-2" DEMANDED_STATE_OPTION="Active" check_device_state
@@ -66,7 +66,7 @@ DEVICE_ID_OPTION="${CORE_DEVICE}-part1" DEMANDED_STATE_OPTION="Detached" check_d
 DEVICE_ID_OPTION="${CORE_DEVICE}-part2" DEMANDED_STATE_OPTION="Detached" check_device_state
 DEVICE_ID_OPTION="${CORE_DEVICE}-part3" DEMANDED_STATE_OPTION="Detached" check_device_state
 
-CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
+CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="y" start_cache
 
 DEVICE_ID_OPTION="${CACHE_DEVICE}-part1" DEMANDED_STATE_OPTION="Running" check_device_state
 DEVICE_ID_OPTION="${DEVICE_NAME}1-1" DEMANDED_STATE_OPTION="Active" check_device_state
diff --git a/test/smoke_test/metadata_corrupt/01 b/test/smoke_test/metadata_corrupt/01
index f30e5c5..73eb91c 100755
--- a/test/smoke_test/metadata_corrupt/01
+++ b/test/smoke_test/metadata_corrupt/01
@@ -114,7 +114,7 @@ do
 	fi
 
 	# Start again with load option, this should fail, metadata is corrupted.
-	NEGATIVE_TEST_OPTION="1" CACHE_ID_OPTION="1" CACHE_LOAD_METADATA_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" start_cache
+	NEGATIVE_TEST_OPTION="1" CACHE_LOAD_METADATA_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" start_cache
 done
 
 
diff --git a/test/smoke_test/metadata_corrupt/02 b/test/smoke_test/metadata_corrupt/02
index 8c10796..2b7236d 100755
--- a/test/smoke_test/metadata_corrupt/02
+++ b/test/smoke_test/metadata_corrupt/02
@@ -91,7 +91,7 @@ do
 	fi
 
 	# Start again with load option, this should fail, metadata is corrupted.
-	NEGATIVE_TEST_OPTION="1" CACHE_ID_OPTION="1" CACHE_LOAD_METADATA_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" start_cache
+	NEGATIVE_TEST_OPTION="1" CACHE_LOAD_METADATA_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" start_cache
 done
 
 test_log_stop
diff --git a/test/smoke_test/promotion/01 b/test/smoke_test/promotion/01
index 90cf8af..b97ca47 100755
--- a/test/smoke_test/promotion/01
+++ b/test/smoke_test/promotion/01
@@ -108,7 +108,7 @@ CACHE_ID_OPTION="1" PROMO_POL_NS_OPTION="promotion-nhit" THRESHOLD_OPTION="451"
 CACHE_ID_OPTION="1" PROMO_POL_NS_OPTION="promotion-nhit" THRESHOLD_OPTION="812" TRIGGER_OPTION="49" set_promotion_params
 CACHE_ID_OPTION="1" PROMO_POL_OPTION="nhit" set_promotion_policy
 CACHE_ID_OPTION="1" stop_cache
-CACHE_MODE_OPTION="wt" CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="1" start_cache
+CACHE_MODE_OPTION="wt" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part1" CACHE_LOAD_METADATA_OPTION="1" start_cache
 CACHE_ID_OPTION="1" PROMO_POL_OPTION="nhit" check_promotion_policy
 CACHE_ID_OPTION="1" PROMO_POL_NS_OPTION="promotion-nhit" THRESHOLD_OPTION="812" TRIGGER_OPTION="49" check_promotion_params
 
diff --git a/test/smoke_test/recovery/01 b/test/smoke_test/recovery/01
index 4ab49dd..68b46b4 100755
--- a/test/smoke_test/recovery/01
+++ b/test/smoke_test/recovery/01
@@ -72,7 +72,7 @@ done
 CACHE_DEVICE_OPTION="${SHORT_LINK}" turn_on_device
 
 for ID in 1 2 3 ; do
-    CACHE_ID_OPTION="$ID" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part${ID}" CACHE_LOAD_METADATA_OPTION="y" CACHE_MODE_OPTION="wb" start_cache
+    CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part${ID}" CACHE_LOAD_METADATA_OPTION="y" start_cache
     CACHE_ID_OPTION="$ID" stop_cache
     run_cmd "mount ${CORE_DEVICE}-part${ID} ${MOUNTPOINT}-${ID}-1"
 done
diff --git a/test/smoke_test/recovery/02 b/test/smoke_test/recovery/02
index 4423750..7c512f6 100755
--- a/test/smoke_test/recovery/02
+++ b/test/smoke_test/recovery/02
@@ -72,7 +72,7 @@ done
 CACHE_DEVICE_OPTION="${SHORT_LINK}" turn_on_device
 
 for ID in 1 2 3 ; do
-    CACHE_ID_OPTION="$ID" CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part${ID}" CACHE_LOAD_METADATA_OPTION="y" CACHE_MODE_OPTION="wb" start_cache
+    CACHE_DEVICE_OPTION="${CACHE_DEVICE}-part${ID}" CACHE_LOAD_METADATA_OPTION="y" start_cache
     CACHE_ID_OPTION="$ID" CORE_ID_OPTION="1" mount_cache
 done