diff --git a/servconf.c b/servconf.c

index ffac5d2c..340045b2 100644

--- a/servconf.c

+++ b/servconf.c

@@ -1042,7 +1042,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 			return -1;

 		}

 		if (strcasecmp(attrib, "user") == 0) {

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->user == NULL)) {

 				result = 0;

 				continue;

 			}

@@ -1054,7 +1054,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 				debug("user %.100s matched 'User %.100s' at "

 				    "line %d", ci->user, arg, line);

 		} else if (strcasecmp(attrib, "group") == 0) {

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->user == NULL)) {

 				result = 0;

 				continue;

 			}

@@ -1067,7 +1067,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 				result = 0;

 			}

 		} else if (strcasecmp(attrib, "host") == 0) {

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->host == NULL)) {

 				result = 0;

 				continue;

 			}

@@ -1079,7 +1079,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 				debug("connection from %.100s matched 'Host "

 				    "%.100s' at line %d", ci->host, arg, line);

 		} else if (strcasecmp(attrib, "address") == 0) {

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->address == NULL)) {

 				result = 0;

 				continue;

 			}

@@ -1098,7 +1098,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 				return -1;

 			}

 		} else if (strcasecmp(attrib, "localaddress") == 0){

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->laddress == NULL)) {

 				result = 0;

 				continue;

 			}

@@ -1124,7 +1124,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 				    arg);

 				return -1;

 			}

-			if (ci == NULL) {

+			if (ci == NULL || (ci->test && ci->lport == -1)) {

 				result = 0;

 				continue;

 			}

@@ -1138,10 +1138,12 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)

 			else

 				result = 0;

 		} else if (strcasecmp(attrib, "rdomain") == 0) {

-			if (ci == NULL || ci->rdomain == NULL) {

+			if (ci == NULL || (ci->test && ci->rdomain == NULL)) {

 				result = 0;

 				continue;

 			}

+			if (ci->rdomain == NULL)

+				match_test_missing_fatal("RDomain", "rdomain");

 			if (match_pattern_list(ci->rdomain, arg, 0) != 1)

 				result = 0;

 			else

diff --git a/servconf.h b/servconf.h

index 54e0a8d8..5483da05 100644

--- a/servconf.h

+++ b/servconf.h

@@ -221,6 +221,8 @@ struct connection_info {

 	const char *laddress;	/* local address */

 	int lport;		/* local port */

 	const char *rdomain;	/* routing domain if available */

+	int test;		/* test mode, allow some attributes to be

+				 * unspecified */

 };

diff --git a/sshd.c b/sshd.c

index cbd3bce9..1fcde502 100644

--- a/sshd.c

+++ b/sshd.c

@@ -1843,6 +1843,7 @@ main(int ac, char **av)

 		 */

 		if (connection_info == NULL)

 			connection_info = get_connection_info(ssh, 0, 0);

+		connection_info->test = 1;

 		parse_server_match_config(&options, connection_info);

 		dump_config(&options);

 	}