diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index d2e62948967bfdca59dead2c4749eaf86a0006eb..4c362957c5be140166f140df04802fd10d625734 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -1,5 +1,5 @@
 # ----------
-# $PostgreSQL: pgsql/src/test/regress/parallel_schedule,v 1.52 2008/12/28 18:54:01 tgl Exp $
+# $PostgreSQL: pgsql/src/test/regress/parallel_schedule,v 1.53 2008/12/30 17:11:26 tgl Exp $
 #
 # By convention, we put no more than twenty tests in any one parallel group;
 # this limits the number of connections needed to run the tests.
@@ -77,13 +77,15 @@ test: misc
 # ----------
 # Another group of parallel tests
 # ----------
-test: select_views portals_p2 rules foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data
+test: select_views portals_p2 rules foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window
 
 # ----------
 # Another group of parallel tests
+# NB: temp.sql does a reconnect which transiently uses 2 connections,
+# so keep this parallel group to at most 19 tests
 # ----------
 # "plpgsql" cannot run concurrently with "rules", nor can "plancache"
-test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes returning largeobject window with xml
+test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes returning largeobject with xml
 
 # run stats by itself because its delay may be insufficient under heavy load
 test: stats
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index a650807f3bb4761dc59ffa32b991db16195f1157..38ead933a042238fc3a9d06f82fc9487cd455bf5 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/test/regress/serial_schedule,v 1.49 2008/12/28 18:54:01 tgl Exp $
+# $PostgreSQL: pgsql/src/test/regress/serial_schedule,v 1.50 2008/12/30 17:11:26 tgl Exp $
 # This should probably be in an order similar to parallel_schedule.
 test: boolean
 test: char
@@ -97,6 +97,9 @@ test: guc
 test: bitmapops
 test: combocid
 test: tsearch
+test: tsdicts
+test: foreign_data
+test: window
 test: plancache
 test: limit
 test: plpgsql
@@ -107,8 +110,6 @@ test: rangefuncs
 test: prepare
 test: without_oid
 test: conversion
-test: tsdicts
-test: foreign_data
 test: truncate
 test: alter_table
 test: sequence
@@ -116,7 +117,6 @@ test: polymorphism
 test: rowtypes
 test: returning
 test: largeobject
-test: window
 test: with
 test: xml
 test: stats