1 files changed, 15 insertions, 31 deletions
diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt
index ee8509fcf19..9f9818000fb 100644
--- a/eval/CMakeLists.txt
+++ b/eval/CMakeLists.txt
@@ -15,7 +15,6 @@ vespa_define_module(
     src/tests/eval/array_array_map
     src/tests/eval/compile_cache
     src/tests/eval/compiled_function
-    src/tests/eval/engine_or_factory
     src/tests/eval/fast_sparse_map
     src/tests/eval/fast_value
     src/tests/eval/function
@@ -28,7 +27,8 @@ vespa_define_module(
     src/tests/eval/node_tools
     src/tests/eval/node_types
     src/tests/eval/param_usage
-    src/tests/eval/simple_tensor
+    src/tests/eval/reference_evaluation
+    src/tests/eval/reference_operations
     src/tests/eval/simple_value
     src/tests/eval/tensor_function
     src/tests/eval/tensor_lambda
@@ -36,6 +36,7 @@ vespa_define_module(
     src/tests/eval/value_cache
     src/tests/eval/value_codec
     src/tests/eval/value_type
+    src/tests/eval/typed_cells
     src/tests/gp/ponder_nov2017
     src/tests/instruction/dense_xw_product_function
     src/tests/instruction/generic_concat
@@ -53,35 +54,21 @@ vespa_define_module(
     src/tests/instruction/dense_tensor_peek_function
     src/tests/instruction/index_lookup_table
     src/tests/instruction/join_with_number
+    src/tests/instruction/dense_add_dimension_optimizer
+    src/tests/instruction/dense_fast_rename_optimizer
+    src/tests/instruction/dense_inplace_join_function
+    src/tests/instruction/dense_pow_as_map_optimizer
+    src/tests/instruction/dense_remove_dimension_optimizer
+    src/tests/instruction/dense_replace_type_function
+    src/tests/instruction/dense_simple_join_function
+    src/tests/instruction/dense_simple_map_function
+    src/tests/instruction/dense_single_reduce_function
+    src/tests/instruction/dense_tensor_create_function
+    src/tests/instruction/vector_from_doubles_function
     src/tests/streamed/value
-    src/tests/tensor/dense_add_dimension_optimizer
-    src/tests/tensor/dense_dimension_combiner
-    src/tests/tensor/dense_fast_rename_optimizer
-    src/tests/tensor/dense_generic_join
-    src/tests/tensor/dense_inplace_join_function
-    src/tests/tensor/dense_number_join_function
-    src/tests/tensor/dense_pow_as_map_optimizer
-    src/tests/tensor/dense_remove_dimension_optimizer
-    src/tests/tensor/dense_replace_type_function
-    src/tests/tensor/dense_simple_join_function
-    src/tests/tensor/dense_simple_map_function
-    src/tests/tensor/dense_single_reduce_function
-    src/tests/tensor/dense_tensor_create_function
-    src/tests/tensor/direct_dense_tensor_builder
-    src/tests/tensor/direct_sparse_tensor_builder
     src/tests/tensor/instruction_benchmark
     src/tests/tensor/onnx_wrapper
-    src/tests/tensor/partial_add
-    src/tests/tensor/partial_modify
-    src/tests/tensor/partial_remove
-    src/tests/tensor/tensor_add_operation
-    src/tests/tensor/tensor_address
     src/tests/tensor/tensor_conformance
-    src/tests/tensor/tensor_modify_operation
-    src/tests/tensor/tensor_remove_operation
-    src/tests/tensor/tensor_serialization
-    src/tests/tensor/typed_cells
-    src/tests/tensor/vector_from_doubles_function
 
     LIBS
     src/vespa/eval
@@ -91,9 +78,6 @@ vespa_define_module(
     src/vespa/eval/eval/value_cache
     src/vespa/eval/gp
     src/vespa/eval/instruction
+    src/vespa/eval/onnx
     src/vespa/eval/streamed
-    src/vespa/eval/tensor
-    src/vespa/eval/tensor/dense
-    src/vespa/eval/tensor/serialization
-    src/vespa/eval/tensor/sparse
 )