diff --git a/integration-tests/luks/create-key-file-unused.py b/integration-tests/luks/create-key-file-unused.py
index 362a1801..1cb760c2 100755
--- a/integration-tests/luks/create-key-file-unused.py
+++ b/integration-tests/luks/create-key-file-unused.py
@@ -18,8 +18,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-luks = to_luks(sdc1.create_encryption("cr-test"))
-luks.set_type(EncryptionType_LUKS2)
+luks = to_luks(sdc1.create_encryption("cr-test", EncryptionType_LUKS2))
 
 # password is needed since the key-file is not used in commit
 
diff --git a/integration-tests/luks/create-key-file.py b/integration-tests/luks/create-key-file.py
index f52bc3d4..915a3470 100755
--- a/integration-tests/luks/create-key-file.py
+++ b/integration-tests/luks/create-key-file.py
@@ -18,8 +18,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-luks = to_luks(sdc1.create_encryption("cr-test"))
-luks.set_type(EncryptionType_LUKS2)
+luks = to_luks(sdc1.create_encryption("cr-test", EncryptionType_LUKS2))
 
 # no need for a password here
 
diff --git a/integration-tests/luks/create-pervasive.py b/integration-tests/luks/create-pervasive.py
index ba67f2c8..080d7f52 100755
--- a/integration-tests/luks/create-pervasive.py
+++ b/integration-tests/luks/create-pervasive.py
@@ -22,9 +22,8 @@
 
 dasdb1 = Partition.find_by_name(staging, "/dev/dasdb1")
 
-luks = to_luks(dasdb1.create_encryption("cr-dasdb1"))
+luks = to_luks(dasdb1.create_encryption("cr-dasdb1", EncryptionType_LUKS2))
 
-luks.set_type(EncryptionType_LUKS2)
 luks.set_key_file("/etc/luks_keys/dasdb1.key")
 luks.set_format_options("--master-key-file '/etc/zkey/repository/secure_xtskey1.skey' --key-size 1024 --cipher paes-xts-plain64 --sector-size 4096")
 
diff --git a/integration-tests/luks/create-with-ext4.py b/integration-tests/luks/create-with-ext4.py
index c15d1795..3d701d23 100755
--- a/integration-tests/luks/create-with-ext4.py
+++ b/integration-tests/luks/create-with-ext4.py
@@ -18,8 +18,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-luks = sdc1.create_encryption("cr-test")
-luks.set_type(EncryptionType_LUKS1)
+luks = sdc1.create_encryption("cr-test", EncryptionType_LUKS1)
 luks.set_password("12345678")
 
 ext4 = luks.create_blk_filesystem(FsType_EXT4)
diff --git a/integration-tests/luks/create-with-lvm.py b/integration-tests/luks/create-with-lvm.py
index ad82e909..cd73776f 100755
--- a/integration-tests/luks/create-with-lvm.py
+++ b/integration-tests/luks/create-with-lvm.py
@@ -18,7 +18,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-luks = sdc1.create_encryption("cr-test")
+luks = sdc1.create_encryption("cr-test", EncryptionType_LUKS1)
 
 luks.set_password("12345678")
 
diff --git a/integration-tests/luks/create.py b/integration-tests/luks/create.py
index 2b84563a..299e8781 100755
--- a/integration-tests/luks/create.py
+++ b/integration-tests/luks/create.py
@@ -18,9 +18,8 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-luks = to_luks(sdc1.create_encryption("cr-test"))
+luks = to_luks(sdc1.create_encryption("cr-test", EncryptionType_LUKS2))
 
-luks.set_type(EncryptionType_LUKS2)
 luks.set_pbkdf("argon2i")
 luks.set_format_options("--pbkdf-memory=1024")
 luks.set_password("12345678")
diff --git a/integration-tests/luks/delete.py b/integration-tests/luks/delete.py
index 68db01b7..667d722b 100755
--- a/integration-tests/luks/delete.py
+++ b/integration-tests/luks/delete.py
@@ -18,7 +18,7 @@
 
 sdc1 = Partition.find_by_name(staging, "/dev/sdc1")
 
-sdc1.remove_descendants()
+sdc1.remove_descendants(View_REMOVE)
 
 print(staging)