diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 40c288d8..4272d08e 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -273,7 +273,7 @@ static int action_loopaesOpen(int arg)
 		return -EINVAL;
 	}
 
-	if ((r = crypt_init(&cd, action_argv[1])))
+	if ((r = crypt_init(&cd, action_argv[0])))
 		goto out;
 
 	r = crypt_format(cd, CRYPT_LOOPAES, NULL, NULL, NULL, NULL,
@@ -281,7 +281,7 @@ static int action_loopaesOpen(int arg)
 	if (r < 0)
 		goto out;
 
-	r = crypt_activate_by_keyfile(cd, action_argv[0],
+	r = crypt_activate_by_keyfile(cd, action_argv[1],
 		CRYPT_ANY_SLOT, opt_key_file, 0,
 		opt_readonly ?  CRYPT_ACTIVATE_READONLY : 0);
 out:
diff --git a/tests/loopaes-test b/tests/loopaes-test
index 740cb44f..16dba8f9 100755
--- a/tests/loopaes-test
+++ b/tests/loopaes-test
@@ -68,7 +68,7 @@ function check_sum() # $key $keysize
         sync
         dmremove $DEV_NAME
 
-        $CRYPTSETUP loopaesOpen $DEV_NAME $LOOPDEV -s $2 --key-file $1 >/dev/null 2>&1
+        $CRYPTSETUP loopaesOpen $LOOPDEV $DEV_NAME -s $2 --key-file $1 >/dev/null 2>&1
         ret=$?
         VSUM=$(sha256sum /dev/mapper/$DEV_NAME | cut -d' ' -f 1)
         if [ $ret -eq 0 -a "$VSUM" = "$EXPSUM" ] ; then
@@ -123,7 +123,7 @@ KEY_FILES="$KEYv1 $KEYv2 $KEYv3"
 for key_size in $KEY_SIZES ; do
         for key in $KEY_FILES ; do
 		prepare "Open Loop-AES $key / AES-$key_size"
-		$CRYPTSETUP loopaesOpen $DEV_NAME $LOOPDEV -s $key_size --key-file $key || fail
+		$CRYPTSETUP loopaesOpen $LOOPDEV $DEV_NAME -s $key_size --key-file $key || fail
 		check_exists
 		check_sum $key $key_size
 		$CRYPTSETUP loopaesClose $DEV_NAME || fail