diff --git a/openbr/core/bee.cpp b/openbr/core/bee.cpp
index db67479..a429f92 100644
--- a/openbr/core/bee.cpp
+++ b/openbr/core/bee.cpp
@@ -305,11 +305,14 @@ cv::Mat BEE::makeMask(const br::FileList &targets, const br::FileList &queries, 
     QList<int> targetPartitions = targets.crossValidationPartitions();
     QList<int> queryPartitions = queries.crossValidationPartitions();
 
+    QList<bool> targetsOnly = File::get<bool>(queries, "targetOnly", false);
+
     Mat mask(queries.size(), targets.size(), CV_8UC1);
     for (int i=0; i<queries.size(); i++) {
         const QString &fileA = queries[i];
         const QString labelA = queryLabels[i];
         const int partitionA = queryPartitions[i];
+        const bool targetOnly = targetsOnly[i];
 
         for (int j=0; j<targets.size(); j++) {
             const QString &fileB = targets[j];
@@ -318,6 +321,7 @@ cv::Mat BEE::makeMask(const br::FileList &targets, const br::FileList &queries, 
 
             Mask_t val;
             if      (fileA == fileB)           val = DontCare;
+            else if (targetOnly)               val = DontCare;
             else if (labelA == "-1")           val = DontCare;
             else if (labelB == "-1")           val = DontCare;
             else if (partitionA != partition)  val = DontCare;
diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp
index 02b4c7c..283ec09 100644
--- a/openbr/openbr_plugin.cpp
+++ b/openbr/openbr_plugin.cpp
@@ -419,7 +419,7 @@ TemplateList TemplateList::fromGallery(const br::File &gallery)
                             Template leaveOneImageOutTemplate = newTemplates[labelIndices[j]];
                             if (k!=leaveOneImageOutTemplate.file.get<int>("Partition")) {
                                 leaveOneImageOutTemplate.file.set("Partition", k);
-                                leaveOneImageOutTemplate.file.set("testOnly", true);
+                                leaveOneImageOutTemplate.file.set("targetOnly", true);
                                 newTemplates.insert(i+1,leaveOneImageOutTemplate);
                             }
                         }
diff --git a/openbr/plugins/validate.cpp b/openbr/plugins/validate.cpp
index f5eaf19..75bca83 100644
--- a/openbr/plugins/validate.cpp
+++ b/openbr/plugins/validate.cpp
@@ -65,9 +65,9 @@ class CrossValidateTransform : public MetaTransform
                     const QString label = partitionedData.at(j).file.get<QString>("Label");
                     QList<int> subjectIndices = partitionedData.find("Label",label);
                     QList<int> removed;
-                    // Remove test only data
+                    // Remove target only data
                     for (int k=subjectIndices.size()-1; k>=0; k--)
-                        if (partitionedData[subjectIndices[k]].file.getBool("testOnly")) {
+                        if (partitionedData[subjectIndices[k]].file.getBool("targetOnly")) {
                             removed.append(subjectIndices[k]);
                             subjectIndices.removeAt(k);
                         }