diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 108db3f618..7c8a96ad95 100644
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -58,6 +58,12 @@ future all test cases should use this. Makes us independent of the test
 case number.
 </server>
 
+<features>
+A list of features that must be present in the client/library for this test
+to be able to run. Features testable here are:
+SSL
+</features>
+
 <killserver>
 Using the same syntax as in <server> but when mentioned here these servers
 are explicitly KILLED when this test case is completed. Only use this if there
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 9ac7e3b5dc..5c7e4ab08c 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -930,6 +930,27 @@ sub serverfortest {
         }
         return 100;
     }
+
+    my @what = getpart("client", "features");
+
+    for(@what) {
+        my $f = $_;
+
+        $f =~ s/\s//g;
+
+        print STDERR "CHECK FOR $f\n";
+
+        if($f eq "SSL") {
+            if($ssl_version) {
+                last;
+            }
+        }
+
+        warn "Test case $testnum requires the missing feature: $_";
+        return 100;
+    }
+
+
     my @what = getpart("client", "server");
 
     if(!$what[0]) {