diff --git a/src/test/regress/output/cluster.out b/src/test/regress/expected/cluster.out
similarity index 85%
rename from src/test/regress/output/cluster.out
rename to src/test/regress/expected/cluster.out
index 67f1f8a8b7..12ae4a2c2f 100644
--- a/src/test/regress/output/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -204,6 +204,49 @@ SELECT * from clstr_tst ORDER BY c;
   8 | 21 | veintiuno
 (32 rows)
 
+-- Verify that inheritance link still works
+INSERT INTO clstr_tst_inh VALUES (0, 100, 'in child table');
+SELECT * from clstr_tst;
+ a  |  b  |       c        
+----+-----+----------------
+ 10 |  14 | catorce
+ 18 |   5 | cinco
+  9 |   4 | cuatro
+ 26 |  19 | diecinueve
+ 12 |  18 | dieciocho
+ 30 |  16 | dieciseis
+ 24 |  17 | diecisiete
+  2 |  10 | diez
+ 23 |  12 | doce
+ 11 |   2 | dos
+ 25 |   9 | nueve
+ 31 |   8 | ocho
+  1 |  11 | once
+ 28 |  15 | quince
+ 32 |   6 | seis
+ 29 |   7 | siete
+ 15 |  13 | trece
+ 22 |  30 | treinta
+ 17 |  32 | treinta y dos
+  3 |  31 | treinta y uno
+  5 |   3 | tres
+ 20 |   1 | uno
+  6 |  20 | veinte
+ 14 |  25 | veinticinco
+ 21 |  24 | veinticuatro
+  4 |  22 | veintidos
+ 19 |  29 | veintinueve
+ 16 |  28 | veintiocho
+ 27 |  26 | veintiseis
+ 13 |  27 | veintisiete
+  7 |  23 | veintitres
+  8 |  21 | veintiuno
+  0 | 100 | in child table
+(33 rows)
+
+-- Verify that foreign key link still works
+INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
+ERROR:  clstr_tst_con referential integrity violation - key referenced from clstr_tst not found in clstr_tst_s
 SELECT conname FROM pg_constraint WHERE conrelid=(SELECT oid FROM pg_class
 	WHERE relname='clstr_tst');
     conname     
@@ -228,5 +271,3 @@ SELECT relname FROM pg_class WHERE relname LIKE 'clstr_tst%' ORDER BY relname;
  clstr_tst_s_rf_a_seq
 (11 rows)
 
-DROP TABLE clstr_tst_inh;
-DROP TABLE clstr_tst;
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 513bdf8c43..0ac2630706 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -55,11 +55,11 @@ test: sanity_check
 # ----------
 test: errors
 test: select
+ignore: random
 
 # ----------
 # The fourth group of parallel test
 # ----------
-ignore: random
 test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates transactions random portals arrays btree_index hash_index
 
 test: privileges
@@ -68,11 +68,10 @@ test: misc
 # ----------
 # The fifth group of parallel test
 # ----------
-test: select_views alter_table portals_p2 rules foreign_key
+test: select_views alter_table portals_p2 rules foreign_key cluster
 
 # ----------
 # The sixth group of parallel test
 # ----------
 # "plpgsql" cannot run concurrently with "rules"
-test: limit plpgsql temp domain rangefuncs copy2 conversion
-test: without_oid
+test: limit plpgsql temp domain rangefuncs copy2 conversion without_oid
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 271c5123d7..d7a6deed2c 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/test/regress/serial_schedule,v 1.14 2002/07/25 10:07:13 ishii Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/serial_schedule,v 1.15 2002/08/11 02:06:32 tgl Exp $
 # This should probably be in an order similar to parallel_schedule.
 test: boolean
 test: char
@@ -79,6 +79,7 @@ test: alter_table
 test: portals_p2
 test: rules
 test: foreign_key
+test: cluster
 test: limit
 test: plpgsql
 test: copy2
diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index 6879c618f2..32041c75cc 100644
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -64,9 +64,15 @@ SELECT * from clstr_tst ORDER BY a;
 SELECT * from clstr_tst ORDER BY b;
 SELECT * from clstr_tst ORDER BY c;
 
+-- Verify that inheritance link still works
+INSERT INTO clstr_tst_inh VALUES (0, 100, 'in child table');
+SELECT * from clstr_tst;
+
+-- Verify that foreign key link still works
+INSERT INTO clstr_tst (b, c) VALUES (1111, 'this should fail');
+
 SELECT conname FROM pg_constraint WHERE conrelid=(SELECT oid FROM pg_class
 	WHERE relname='clstr_tst');
-SELECT relname FROM pg_class WHERE relname LIKE 'clstr_tst%' ORDER BY relname;
 
-DROP TABLE clstr_tst_inh;
-DROP TABLE clstr_tst;
+
+SELECT relname FROM pg_class WHERE relname LIKE 'clstr_tst%' ORDER BY relname;