1 files changed, 12 insertions, 0 deletions
diff --git a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
index df415e39134..a9681cd85c9 100644
--- a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
+++ b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
@@ -2,9 +2,13 @@
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/eval/eval/test/tensor_conformance.h>
 #include <vespa/eval/eval/simple_tensor_engine.h>
+#include <vespa/eval/eval/simple_value.h>
+#include <vespa/eval/eval/fast_value.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
+using vespalib::eval::SimpleValueBuilderFactory;
+using vespalib::eval::FastValueBuilderFactory;
 using vespalib::eval::SimpleTensorEngine;
 using vespalib::eval::test::TensorConformance;
 using vespalib::tensor::DefaultTensorEngine;
@@ -21,6 +25,14 @@ TEST("require that production tensor implementation passes all conformance tests
     TEST_DO(TensorConformance::run_tests(module_src_path, DefaultTensorEngine::ref()));
 }
 
+TEST("require that SimpleValue implementation passes all conformance tests (except ImmediateAPI tests)") {
+    TEST_DO(TensorConformance::run_tests(module_src_path, SimpleValueBuilderFactory::get()));
+}
+
+TEST("require that FastValue implementation passes all conformance tests (except ImmediateAPI tests)") {
+    TEST_DO(TensorConformance::run_tests(module_src_path, FastValueBuilderFactory::get()));
+}
+
 TEST("require that tensor serialization test spec can be generated") {
     vespalib::string spec = module_src_path + "src/apps/make_tensor_binary_format_test_spec/test_spec.json";
     vespalib::string binary = module_build_path + "src/apps/make_tensor_binary_format_test_spec/eval_make_tensor_binary_format_test_spec_app";