diff --git a/ChangeLog b/ChangeLog
index 8a838bb21a..058e0659bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 	* tests/nm-online.c: New file.  Simple utility that returns exit status
 	  noting whether the connection is offline or online.  If offline on
-	  start, it waits 60 seconds (or a command-line given value) for an
+	  start, it waits 30 seconds (or a command-line given value) for an
 	  online signal.  If it times out, it again returns offline.  This is
 	  useful for scripts that want to wait for network connections.
 
diff --git a/test/nm-online.c b/test/nm-online.c
index d9787795d3..351a14a050 100644
--- a/test/nm-online.c
+++ b/test/nm-online.c
@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
 	DBusConnection *connection;
 	DBusError error;
 	GMainLoop *loop;
-	int timeout = 60;
+	int timeout = 30;
 
 	if (argc == 2) {
 		timeout = (int) strtol (argv[1], NULL, 10);