diff --git a/executor-scripts/linux/link b/executor-scripts/linux/link
index 9921840..7211d70 100755
--- a/executor-scripts/linux/link
+++ b/executor-scripts/linux/link
@@ -4,10 +4,6 @@ set -e
 
 [ -n "$VERBOSE" ] && set -x
 
-IF_LINK_OPTIONS="$IF_LINK_OPTIONS"
-[ -n "$IF_MTU" ] && IF_LINK_OPTIONS="$IF_LINK_OPTIONS mtu $IF_MTU"
-[ -n "$IF_HWADDRESS" ] && IF_LINK_OPTIONS="$IF_LINK_OPTIONS address $IF_HWADDRESS"
-
 is_vlan() {
 	case "$IFACE" in
 		*#*) return 1 ;;
@@ -36,26 +32,23 @@ pre-up)
 	if [ "${IF_LINK_TYPE}" = "dummy" ]; then
 		if [ -d "/sys/class/net/${IFACE}" ]; then
 			iface_type=$(ip -d link show dev "${IFACE}" | head -n3 | tail -n1 | awk '{ print $1 }')
-			if [ "${iface_type}" = 'dummy' ]; then
-				exit 0
+			if [ "${iface_type}" != 'dummy' ]; then
+				echo "Interface ${IFACE} exists but is of type ${iface_type} instead of dummy"
+				exit 1
 			fi
 		fi
 
-		ip link add "${IFACE}" type dummy
+		${MOCK} ip link add "${IFACE}" type dummy
 	fi
-	;;
-up|down)
-	if is_vlan; then
-		ADD_DEL="add"
-		[ "$PHASE" = "down" ] && ADD_DEL="delete"
 
-		if [ "$PHASE" = "up" -a -e /sys/class/net/$IFACE ]; then
+	if is_vlan; then
+		if [ -d "/sys/class/net/${IFACE}" ]; then
 			exit 0
 		fi
 
-		if [ -z "$MOCK" ]; then
-			if ! ip link show "$IF_VLAN_RAW_DEVICE" >/dev/null; then
-				echo "Device $IF_VLAN_RAW_DEVICE for $IFACE does not exist"
+		if [ -z "${MOCK}" ]; then
+			if [ ! -d "/sys/class/net/${IF_VLAN_RAW_DEVICE}" ]; then
+				echo "Underlay device ${IF_VLAN_RAW_DEVICE} for ${IFACE} does not exist"
 				exit 1
 			fi
 
@@ -65,22 +58,31 @@ up|down)
 			fi
 		fi
 
-		${MOCK} ip link $ADD_DEL link "$IF_VLAN_RAW_DEVICE" name "$IFACE" type vlan id "$IF_VLAN_ID"
-		[ "$PHASE" = "down" ] && exit 0
+		${MOCK} ip link add link "${IF_VLAN_RAW_DEVICE}" name "${IFACE}" type vlan id "${IF_VLAN_ID}"
 	fi
+	;;
+up)
+	IF_LINK_OPTIONS="$IF_LINK_OPTIONS"
+	[ -n "$IF_MTU" ] && IF_LINK_OPTIONS="$IF_LINK_OPTIONS mtu $IF_MTU"
+	[ -n "$IF_HWADDRESS" ] && IF_LINK_OPTIONS="$IF_LINK_OPTIONS address $IF_HWADDRESS"
 
-	${MOCK} ip link set $PHASE dev $IFACE $IF_LINK_OPTIONS
+	${MOCK} ip link set up dev "${IFACE}" ${IF_LINK_OPTIONS}
 
 	# Set alias is configured
 	if [ "${IF_ALIAS}" ]; then
 		${MOCK} ip link set alias "${IF_ALIAS}" dev "${IFACE}"
 	fi
 	;;
+down)
+	${MOCK} ip link set down dev "${IFACE}"
+	;;
 post-down)
-	if [ "${IF_LINK_TYPE}" = "dummy" ]; then
-		if [ -d "/sys/class/net/${IFACE}" ]; then
-			ip link del "${IFACE}"
+	if [ "${IF_LINK_TYPE}" = "dummy" ] || is_vlan; then
+		if [ -z "${MOCK}" -a ! -d "/sys/class/net/${IFACE}" ]; then
+			exit 0
 		fi
+
+		${MOCK} ip link del "${IFACE}"
 	fi
 	;;
 depend)
diff --git a/tests/linux/link_test b/tests/linux/link_test
index 505adcd..db3e787 100755
--- a/tests/linux/link_test
+++ b/tests/linux/link_test
@@ -8,12 +8,13 @@ tests_init \
 	down \
 	mtu \
 	hwaddress \
-	vlan_explicit_up \
-	vlan_explicit_down \
-	vlan_guessed_up \
-	vlan_guessed_down \
+	vlan_explicit_pre_up \
+	vlan_explicit_post_down \
+	vlan_guessed_pre_up \
+	vlan_guessed_post_down \
 	vlan_explicit_depend \
-	vlan_guessed_depend
+	vlan_guessed_depend \
+	dummy_pre_up
 
 up_body() {
 	export IFACE=lo PHASE=up MOCK=echo
@@ -39,34 +40,34 @@ hwaddress_body() {
 		${EXECUTOR}
 }
 
-vlan_explicit_up_body() {
-	export IFACE=servers PHASE=up MOCK=echo \
+vlan_explicit_pre_up_body() {
+	export IFACE=servers PHASE=pre-up MOCK=echo \
 		IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
 	atf_check -s exit:0 -o match:'ip link add link eth0 name servers type vlan id 123' \
 		${EXECUTOR}
 }
 
-vlan_explicit_down_body() {
-	export IFACE=servers PHASE=down MOCK=echo \
+vlan_explicit_post_down_body() {
+	export IFACE=servers PHASE=post-down MOCK=echo \
 		IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
-	atf_check -s exit:0 -o match:'ip link delete link eth0 name servers type vlan id 123' \
+	atf_check -s exit:0 -o match:'ip link del servers' \
 		${EXECUTOR}
 }
 
-vlan_guessed_up_body() {
-	export IFACE=eth0.8 PHASE=up MOCK=echo
+vlan_guessed_pre_up_body() {
+	export IFACE=eth0.8 PHASE=pre-up MOCK=echo
 	atf_check -s exit:0 -o match:'ip link add link eth0 name eth0.8 type vlan id 8' \
 		${EXECUTOR}
 }
 
-vlan_guessed_down_body() {
-	export IFACE=eth0.8 PHASE=down MOCK=echo
-	atf_check -s exit:0 -o match:'ip link delete link eth0 name eth0.8 type vlan id 8' \
+vlan_guessed_post_down_body() {
+	export IFACE=eth0.8 PHASE=post-down MOCK=echo
+	atf_check -s exit:0 -o match:'ip link del eth0.8' \
 		${EXECUTOR}
 }
 
 vlan_explicit_depend_body() {
-	export IFACE=servers PHASE=up MOCK=echo \
+	export IFACE=servers PHASE=depend \
 		IF_VLAN_RAW_DEVICE="eth0" IF_VLAN_ID="123"
 	atf_check -s exit:0 -o match:'eth0' \
 		${EXECUTOR}
@@ -77,3 +78,9 @@ vlan_guessed_depend_body() {
 	atf_check -s exit:0 -o match:'eth0' \
 		${EXECUTOR}
 }
+
+dummy_pre_up_body() {
+	export IFACE=yolo IF_LINK_TYPE=dummy PHASE=pre-up MOCK=echo
+	atf_check -s exit:0 -o match:'ip link add yolo type dummy' \
+		${EXECUTOR}
+}