diff --git a/src/internal.c b/src/internal.c
index 095bb84dd..4d59c343e 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -8208,8 +8208,6 @@ int SetCipherList(Suites* s, const char* list)
 
         case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 :
         case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 :
-            if (requirement == REQUIRES_RSA)
-                return 1;
             if (requirement == REQUIRES_RSA_SIG)
                 return 1;
             if (requirement == REQUIRES_ECC_STATIC)
diff --git a/tests/test-ecc.conf b/tests/test-ecc.conf
index ca1bc56f5..a973ac15e 100644
--- a/tests/test-ecc.conf
+++ b/tests/test-ecc.conf
@@ -86,6 +86,14 @@
 -v 3
 -l ECDHE-RSA-AES128-SHA
 
+# server TLSv1.2 ECDHE-RSA-AES128-SHA256
+-v 3
+-l ECDHE-RSA-AES128-SHA256
+
+# client TLSv1.2 ECDHE-RSA-AES128-SHA256 
+-v 3
+-l ECDHE-RSA-AES128-SHA256
+
 # server TLSv1.2 ECDHE-RSA-AES256
 -v 3
 -l ECDHE-RSA-AES256-SHA
@@ -215,6 +223,17 @@
 -l ECDHE-ECDSA-AES128-SHA
 -A ./certs/server-ecc.pem
 
+# server TLSv1.2 ECDHE-ECDSA-AES128-SHA256
+-v 3
+-l ECDHE-ECDSA-AES128-SHA256
+-c ./certs/server-ecc.pem
+-k ./certs/ecc-key.pem
+
+# client TLSv1.2 ECDHE-ECDSA-AES128-SHA256
+-v 3
+-l ECDHE-ECDSA-AES128-SHA256
+-A ./certs/server-ecc.pem
+
 # server TLSv1.2 ECDHE-ECDSA-AES256
 -v 3
 -l ECDHE-ECDSA-AES256-SHA
@@ -336,6 +355,16 @@
 -v 3
 -l ECDH-RSA-AES128-SHA
 
+# server TLSv1.2 ECDH-RSA-AES128-SHA256 
+-v 3
+-l ECDH-RSA-AES128-SHA256
+-c ./certs/server-ecc-rsa.pem
+-k ./certs/ecc-key.pem
+
+# client TLSv1.2 ECDH-RSA-AES128-SHA256 
+-v 3
+-l ECDH-RSA-AES128-SHA256
+
 # server TLSv1.2 ECDH-RSA-AES256
 -v 3
 -l ECDH-RSA-AES256-SHA
@@ -467,6 +496,17 @@
 -l ECDH-ECDSA-AES128-SHA
 -A ./certs/server-ecc.pem
 
+# server TLSv1.2 ECDH-ECDSA-AES128-SHA256
+-v 3
+-l ECDH-ECDSA-AES128-SHA256
+-c ./certs/server-ecc.pem
+-k ./certs/ecc-key.pem
+
+# client TLSv1.2 ECDH-ECDSA-AES128-SHA256 
+-v 3
+-l ECDH-ECDSA-AES128-SHA256
+-A ./certs/server-ecc.pem
+
 # server TLSv1.2 ECDH-ECDSA-AES256
 -v 3
 -l ECDH-ECDSA-AES256-SHA