diff --git a/libnozzle/tests/api_nozzle_set_down.c b/libnozzle/tests/api_nozzle_set_down.c
index da48d584..3921772b 100644
--- a/libnozzle/tests/api_nozzle_set_down.c
+++ b/libnozzle/tests/api_nozzle_set_down.c
@@ -1,119 +1,126 @@
 /*
  * Copyright (C) 2010-2018 Red Hat, Inc.  All rights reserved.
  *
  * Author: Fabio M. Di Nitto <fabbione@kronosnet.org>
  *
  * This software licensed under GPL-2.0+, LGPL-2.0+
  */
 
 #include "config.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdint.h>
 #include <limits.h>
 
 #include "test-common.h"
 
 static int test(void)
 {
 	char verifycmd[1024];
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	nozzle_t nozzle;
 	char *error_string = NULL;
 
 	printf("Testing interface down\n");
 
 	memset(device_name, 0, size);
 	nozzle = nozzle_open(device_name, size, NULL);
 	if (!nozzle) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Put the interface up\n");
 
 	err = nozzle_set_up(nozzle);
 	if (err < 0) {
 		printf("Unable to set interface up\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	memset(verifycmd, 0, sizeof(verifycmd));
 	snprintf(verifycmd, sizeof(verifycmd)-1,
 #ifdef KNET_LINUX
 		 "ip addr show dev %s | grep -q UP", nozzle->name);
 #endif
 #ifdef KNET_BSD
 		 "ifconfig %s | grep -q UP", nozzle->name);
 #endif
 	err = execute_bin_sh_command(verifycmd, &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to verify inteface UP\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Put the interface down\n");
 
 	err = nozzle_set_down(nozzle);
 	if (err < 0) {
 		printf("Unable to put the interface down\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	memset(verifycmd, 0, sizeof(verifycmd));
 	snprintf(verifycmd, sizeof(verifycmd)-1,
 #ifdef KNET_LINUX
 		 "ip addr show dev %s | grep -q UP", nozzle->name);
 #endif
 #ifdef KNET_BSD
 		 "ifconfig %s | grep -q UP", nozzle->name);
 #endif
 	err = execute_bin_sh_command(verifycmd, &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Unable to verify inteface DOWN\n");
 		err = -1;
 		goto out_clean;
 	}
 
+	printf("Try to DOWN the same interface twice\n");
+	if (nozzle_set_down(nozzle) < 0) {
+		printf("Interface was already DOWN, spurious error received from nozzle_set_down\n");
+		err = -1;
+		goto out_clean;
+	}
+
 	printf("Pass NULL to nozzle set_down\n");
 	errno = 0;
 	if ((nozzle_set_down(NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in nozzle_set_down sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 out_clean:
 	nozzle_close(nozzle);
 
 	return err;
 }
 
 int main(void)
 {
 	need_root();
 
 	if (test() < 0)
 		return FAIL;
 
 	return PASS;
 }