diff --git a/Modules/Setup.guido b/Modules/Setup.guido
index 60e44d1acd7..8ed5a1e877c 100644
--- a/Modules/Setup.guido
+++ b/Modules/Setup.guido
@@ -27,12 +27,22 @@
 # Some special rules to define PYTHONPATH
 # Edit the definitions below to indicate which options you are using
 
+# Don't edit this (usually)
 DESTLIB=$(prefix)/lib/python
+
+# Standard enabled (tests are always available)
+TESTPATH=$(DESTLIB)/test
+
+# Enable this for SGI systems
 ARCHPATH=:$(DESTLIB)/sgi
+
+# Enable this for Sun systems
 #ARCHPATH=:$(DESTLIB)/sun4
+
+# Enable this if stdwin installed
 STDWINPATH=:$(DESTLIB)/stdwin
 
-PYTHONPATH=.:$(DESTLIB)$(ARCHPATH)$(STDWINPATH)
+PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(ARCHPATH)$(STDWINPATH)
 
 
 # Modules that should always be present (non UNIX dependent)
diff --git a/Modules/Setup.irix5 b/Modules/Setup.irix5
index a058eb36a93..d30f19e5e5d 100644
--- a/Modules/Setup.irix5
+++ b/Modules/Setup.irix5
@@ -27,12 +27,22 @@
 # Some special rules to define PYTHONPATH
 # Edit the definitions below to indicate which options you are using
 
+# Don't edit this (usually)
 DESTLIB=$(prefix)/lib/python
-ARCHPATH=:$(DESTLIB)/sgi
-#ARCHPATH=:$(DESTLIB)/sun4
-#STDWINPATH=:$(DESTLIB)/stdwin
 
-PYTHONPATH=.:$(DESTLIB)$(ARCHPATH)$(STDWINPATH)
+# Standard enabled (tests are always available)
+TESTPATH=$(DESTLIB)/test
+
+# Enable this for SGI systems
+ARCHPATH=:$(DESTLIB)/sgi
+
+# Enable this for Sun systems
+#ARCHPATH=:$(DESTLIB)/sun4
+
+# Enable this if stdwin installed
+STDWINPATH=:$(DESTLIB)/stdwin
+
+PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(ARCHPATH)$(STDWINPATH)
 
 
 # Modules that should always be present (non UNIX dependent)