diff --git a/tests/compat.sh b/tests/compat.sh
index deeb949..83f28fc 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -366,7 +366,7 @@
 
     "ECDSA")
 
-        if [ "$MODE" = "tls1_2" ];
+        if [ "$MODE" != "ssl3" ];
         then
             P_CIPHERS="$P_CIPHERS                               \
                 TLS-ECDHE-ECDSA-WITH-CAMELLIA-128-CBC-SHA256    \
@@ -378,6 +378,14 @@
 
     "RSA")
 
+        if [ "$MODE" != "ssl3" ];
+        then
+            P_CIPHERS="$P_CIPHERS                           \
+                TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256  \
+                TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384  \
+                "
+        fi
+
         if [ "$MODE" = "tls1_2" ];
         then
             P_CIPHERS="$P_CIPHERS                           \
@@ -385,10 +393,8 @@
                 TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256        \
                 TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256    \
                 TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256    \
-                TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256  \
-                TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384  \
-                TLS-ECDHE-RSA-WITH-CAMELLIA-128-GCM-SHA256      \
-                TLS-ECDHE-RSA-WITH-CAMELLIA-256-GCM-SHA384      \
+                TLS-ECDHE-RSA-WITH-CAMELLIA-128-GCM-SHA256  \
+                TLS-ECDHE-RSA-WITH-CAMELLIA-256-GCM-SHA384  \
                 TLS-DHE-RSA-WITH-CAMELLIA-128-GCM-SHA256    \
                 TLS-DHE-RSA-WITH-CAMELLIA-256-GCM-SHA384    \
                 TLS-RSA-WITH-CAMELLIA-128-GCM-SHA256        \
@@ -413,6 +419,24 @@
             TLS-RSA-PSK-WITH-AES-128-CBC-SHA         \
             TLS-RSA-WITH-NULL-SHA                    \
             TLS-RSA-WITH-NULL-MD5                    \
+            TLS-PSK-WITH-AES-128-CBC-SHA256          \
+            TLS-PSK-WITH-AES-256-CBC-SHA384          \
+            TLS-DHE-PSK-WITH-AES-128-CBC-SHA256      \
+            TLS-DHE-PSK-WITH-AES-256-CBC-SHA384      \
+            TLS-PSK-WITH-NULL-SHA256                 \
+            TLS-PSK-WITH-NULL-SHA384                 \
+            TLS-DHE-PSK-WITH-NULL-SHA256             \
+            TLS-DHE-PSK-WITH-NULL-SHA384             \
+            TLS-RSA-PSK-WITH-AES-256-CBC-SHA384      \
+            TLS-RSA-PSK-WITH-AES-128-CBC-SHA256      \
+            TLS-RSA-PSK-WITH-NULL-SHA256             \
+            TLS-RSA-PSK-WITH-NULL-SHA384             \
+            TLS-DHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
+            TLS-DHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
+            TLS-PSK-WITH-CAMELLIA-128-CBC-SHA256     \
+            TLS-PSK-WITH-CAMELLIA-256-CBC-SHA384     \
+            TLS-RSA-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
+            TLS-RSA-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
             "
 
 
@@ -424,41 +448,6 @@
                 TLS-ECDHE-PSK-WITH-3DES-EDE-CBC-SHA     \
                 TLS-ECDHE-PSK-WITH-RC4-128-SHA          \
                 TLS-ECDHE-PSK-WITH-NULL-SHA             \
-                "
-        fi
-
-        if [ "$MODE" = "tls1_2" ];
-        then
-            P_CIPHERS="$P_CIPHERS                        \
-                TLS-PSK-WITH-AES-128-CBC-SHA256          \
-                TLS-PSK-WITH-AES-256-CBC-SHA384          \
-                TLS-DHE-PSK-WITH-AES-128-CBC-SHA256      \
-                TLS-DHE-PSK-WITH-AES-256-CBC-SHA384      \
-                TLS-PSK-WITH-AES-128-GCM-SHA256          \
-                TLS-PSK-WITH-AES-256-GCM-SHA384          \
-                TLS-DHE-PSK-WITH-AES-128-GCM-SHA256      \
-                TLS-DHE-PSK-WITH-AES-256-GCM-SHA384      \
-                TLS-PSK-WITH-NULL-SHA256                 \
-                TLS-PSK-WITH-NULL-SHA384                 \
-                TLS-DHE-PSK-WITH-NULL-SHA256             \
-                TLS-DHE-PSK-WITH-NULL-SHA384             \
-                TLS-PSK-WITH-CAMELLIA-128-CBC-SHA256     \
-                TLS-PSK-WITH-CAMELLIA-256-CBC-SHA384     \
-                TLS-RSA-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
-                TLS-RSA-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
-                TLS-PSK-WITH-CAMELLIA-128-GCM-SHA256     \
-                TLS-PSK-WITH-CAMELLIA-256-GCM-SHA384     \
-                TLS-DHE-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
-                TLS-DHE-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
-                TLS-DHE-PSK-WITH-CAMELLIA-128-CBC-SHA256 \
-                TLS-DHE-PSK-WITH-CAMELLIA-256-CBC-SHA384 \
-                TLS-RSA-PSK-WITH-AES-256-CBC-SHA384         \
-                TLS-RSA-PSK-WITH-AES-256-GCM-SHA384         \
-                TLS-RSA-PSK-WITH-CAMELLIA-256-CBC-SHA384    \
-                TLS-RSA-PSK-WITH-AES-128-CBC-SHA256         \
-                TLS-RSA-PSK-WITH-AES-128-GCM-SHA256         \
-                TLS-RSA-PSK-WITH-CAMELLIA-128-CBC-SHA256    \
-                TLS-RSA-WITH-NULL-SHA256                    \
                 TLS-ECDHE-PSK-WITH-AES-256-CBC-SHA384       \
                 TLS-ECDHE-PSK-WITH-CAMELLIA-256-CBC-SHA384  \
                 TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256       \
@@ -468,6 +457,25 @@
                 "
         fi
 
+        if [ "$MODE" = "tls1_2" ];
+        then
+            P_CIPHERS="$P_CIPHERS                        \
+                TLS-PSK-WITH-AES-128-GCM-SHA256          \
+                TLS-PSK-WITH-AES-256-GCM-SHA384          \
+                TLS-DHE-PSK-WITH-AES-128-GCM-SHA256      \
+                TLS-DHE-PSK-WITH-AES-256-GCM-SHA384      \
+                TLS-RSA-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
+                TLS-RSA-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
+                TLS-PSK-WITH-CAMELLIA-128-GCM-SHA256     \
+                TLS-PSK-WITH-CAMELLIA-256-GCM-SHA384     \
+                TLS-DHE-PSK-WITH-CAMELLIA-128-GCM-SHA256 \
+                TLS-DHE-PSK-WITH-CAMELLIA-256-GCM-SHA384 \
+                TLS-RSA-PSK-WITH-AES-256-GCM-SHA384         \
+                TLS-RSA-PSK-WITH-AES-128-GCM-SHA256         \
+                TLS-RSA-WITH-NULL-SHA256                    \
+                "
+        fi
+
 esac
 
 # Filter ciphersuites