-foreach my $f ( @files ) {
- ok(run(test(["evp_test", srctop_file("test", "$f")])),
+my @files = qw( evpciph.txt evpdigest.txt );
+my @defltfiles = qw( evpencod.txt evpkdf.txt evppkey_kdf.txt evpmac.txt
+ evppbe.txt evppkey.txt evppkey_ecc.txt evpcase.txt evpaessiv.txt
+ evpccmcavs.txt );
+
+plan tests => (scalar(@configs) * scalar(@files)) + scalar(@defltfiles);
+
+$ENV{OPENSSL_MODULES} = bldtop_dir("providers");
+
+foreach (@configs) {
+ $ENV{OPENSSL_CONF} = srctop_file("test", $_);
+
+ foreach my $f ( @files ) {
+ ok(run(test(["evp_test", data_file("$f")])),
+ "running evp_test $f");
+ }
+}
+
+#TODO(3.0): As more operations are converted to providers we can move more of
+# these tests to the loop above
+
+$ENV{OPENSSL_CONF} = srctop_file("test", $defaultcnf);
+
+foreach my $f ( @defltfiles ) {
+ ok(run(test(["evp_test", data_file("$f")])),