diff --git a/HISTORY b/HISTORY
index 3cb255eb..42d73b7c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -13,6 +13,8 @@ SnapRAID HISTORY
    whatever reason.
  * Adds UUID support to Btrfs filesystems. It's present only if the
    libblkid library is available on the system.
+ * Added a new --no-warnings option to disable some repetitive warnings
+   that could be annoying to power users.
 
 9.1 2015/11
 ===========
diff --git a/Makefile.am b/Makefile.am
index ddf78386..382da6fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -251,7 +251,7 @@ endif
 	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) up
 	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) down
 	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) devices
-	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) smart --test-no-warnings
+	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) smart --no-warnings
 	$(FAILENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) smart --test-fake-device --test-expect-failure
 if HAVE_SYMLINK
 	$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(PAR1) pool
diff --git a/cmdline/snapraid.c b/cmdline/snapraid.c
index 0ecaa8e1..1c79091a 100644
--- a/cmdline/snapraid.c
+++ b/cmdline/snapraid.c
@@ -364,7 +364,7 @@ struct option long_options[] = {
 	{ "test-fake-device", 0, 0, OPT_TEST_FAKE_DEVICE },
 
 	/* Disable annoying warnings */
-	{ "test-no-warnings", 0, 0, OPT_NO_WARNINGS },
+	{ "no-warnings", 0, 0, OPT_NO_WARNINGS },
 
 	/* Fake UUID */
 	{ "test-fake-uuid", 0, 0, OPT_TEST_FAKE_UUID },