diff --git a/gcc/testsuite/g++.old-deja/g++.benjamin/bool01.C b/gcc/testsuite/g++.old-deja/g++.benjamin/bool01.C
index afc7060195046dcee6f21b8361d7db3048e3c141..482150bcf6fa2e84bae39ab3e74a89ddf827387c 100644
--- a/gcc/testsuite/g++.old-deja/g++.benjamin/bool01.C
+++ b/gcc/testsuite/g++.old-deja/g++.benjamin/bool01.C
@@ -2,6 +2,7 @@
 //test for bools with inclusive ors
 
 #include <assert.h>
+#include <limits.h>
 
 void bar ( bool  x ) {};
 void bars ( short  x ) {};
@@ -45,12 +46,14 @@ int ors(){
 }
 
 
+#if INT_MAX > 32767
 int orus(){
   unsigned short y = 1;
   bars ( y );
   int blob = ( 65539 | int (y) );
   return blob;  //expect 65539, will be 3 if done in us type
 }
+#endif
 
 int main() {
   int tmp;
@@ -66,11 +69,10 @@ int main() {
   assert (tmp ==27);
   tmp = ors();
   assert (tmp ==27);
-  if (sizeof (int) > 2 && sizeof (int) > sizeof (unsigned short))
-    {
-      tmp = orus();
-      assert (tmp == 65539);
-    }
+#if INT_MAX > 32767
+  tmp = orus();
+  assert (tmp == 65539);
+#endif
 
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900227_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900227_01.C
index 4eaf41503d1e4e64300a6dadf6e1966e5bc6e29a..51bd60a68d199a3d07b64a8863f0844124949019 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900227_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900227_01.C
@@ -30,13 +30,9 @@
 
 // Special g++ Options:
 
-#include <limits.h>
-
 int main ();
 
-#if INT_MAX > 32767
-short s = (short) &main;	// WARNING - small integer
-#endif
+short s = (short) &main;	// WARNING - small integer XFAIL h8*-*-*
 char c = (char) &main;		// WARNING - small integer
 
 int main () { return 0; }
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C
index 7fecbaa6e2a0a39e2bc6ff860a9071596a3b25af..62f35e874684c87b9093f0a7285e86de772be306 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib5.C
@@ -1,5 +1,5 @@
 // Test that attributes weak and alias coexist.
-// excess errors test - XFAIL alpha*-dec-osf* *-hms
+// excess errors test - XFAIL alpha*-dec-osf* *-*-hms
 
 extern "C" {
   void f () __attribute__((weak, alias ("_f")));
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C b/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
index 4cec6948a312277376f86d2e94b4321fae7c8a36..79c0bd96e3a8585245166fb658ed3e72ca0f8c4d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
@@ -3,7 +3,7 @@
 //  support, because it doesn't support variadic functions.
 
 // Special g++ Options: -fvtable-thunks
-// excess errors test - XFAIL mips*-*-* rs6000-*-* powerpc-*-eabi m68k-*-coff m68k-motorola-sysv m88k-motorola-sysv3  mn10300-*-* mn10200-*-* v850-*-* sh-*-* h8*
+// excess errors test - XFAIL mips*-*-* rs6000-*-* powerpc-*-eabi m68k-*-coff m68k-motorola-sysv m88k-motorola-sysv3  mn10300-*-* mn10200-*-* v850-*-* sh-*-* h8*-*-*
 
 #include <stdarg.h>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash18.C b/gcc/testsuite/g++.old-deja/g++.other/crash18.C
index 789e3166fb40bda5c41d3a29c2f05001a6259b5b..c6261c8b85f62370488eb5e764301a8e69f9513c 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash18.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash18.C
@@ -1,6 +1,7 @@
 // Build don't link:
 // Special g++ Options: -fvtable-gc
 // Origin: Mark Mitchell <mitchell@codesourcery.com>
+// excess errors test - XFAIL *-*-coff *-*-aout *-*-hms
 
 struct S {
   virtual void f ();
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/static6.C b/gcc/testsuite/g++.old-deja/g++.pt/static6.C
index c52c3cb2af512438af1f2e313cf07ce12c058b88..b433e3efa390fb4733add3a5339e392879959764 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/static6.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/static6.C
@@ -1,4 +1,5 @@
 // Build don't run:
+// excess errors test - XFAIL *-*-aout *-*-coff *-*-hpux* alpha*-dec-osf* *-*-hms
 
 // Simplified from testcase by Erez Louidor Lior <s3824888@techst02.technion.ac.il>