diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 14ed35e139..dd7467c14d 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -2155,7 +2155,7 @@ nm_utils_new_vlan_name (const char *parent_iface, guint32 vlan_id)
 	else if (vlan_id < 1000)
 		id_len = 4;
 	else {
-		g_return_val_if_fail (vlan_id < 4096, NULL);
+		g_return_val_if_fail (vlan_id < 4095, NULL);
 		id_len = 5;
 	}
 
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c
index 3ec9df41a1..31afd62d2a 100644
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-general-with-expect.c
@@ -879,7 +879,8 @@ test_nm_utils_new_vlan_name (void)
 			gs_free char *vlan_id_s = NULL;
 			guint vlan_id;
 
-			vlan_id = nmtst_get_rand_int () % 4096;
+			/* Create a random VLAN id between 1 and 4094 */
+			vlan_id = 1 + nmtst_get_rand_int () % 4094;
 
 			vlan_id_s = g_strdup_printf (".%d", vlan_id);