diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index ed03fcecbca..0aee919c44a 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -1136,12 +1136,13 @@ check_for_not_null_inheritance(ClusterInfo *cluster)
 		PGconn	   *conn = connectToServer(&old_cluster, active_db->db_name);
 
 		res = executeQueryOrDie(conn,
-								"SELECT cc.relnamespace::pg_catalog.regnamespace AS nspname, "
-								"       cc.relname, ac.attname "
+								"SELECT nspname, cc.relname, ac.attname "
 								"FROM pg_catalog.pg_inherits i, pg_catalog.pg_attribute ac, "
-								"     pg_catalog.pg_attribute ap, pg_catalog.pg_class cc "
+								"     pg_catalog.pg_attribute ap, pg_catalog.pg_class cc, "
+								"     pg_catalog.pg_namespace nc "
 								"WHERE cc.oid = ac.attrelid AND i.inhrelid = ac.attrelid "
 								"      AND i.inhparent = ap.attrelid AND ac.attname = ap.attname "
+								"      AND cc.relnamespace = nc.oid "
 								"      AND ap.attnum > 0 and ap.attnotnull AND NOT ac.attnotnull");
 
 		ntup = PQntuples(res);