2 files changed, 5 insertions, 18 deletions
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
index 05f8964e516..8848b6f1e7f 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java
@@ -89,23 +89,9 @@ public class CommandLineOptionsTest {
     }
 
     @Test
-    public void testInvalidCombination1() {
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Print ids and headers only options are mutually exclusive.");
-        getParsedOptions("--headersonly", "--printids");
-    }
-
-    @Test
-    public void testInvalidCombination2() {
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Field set option can not be used in combination with print ids or headers only options.");
-        getParsedOptions("--headersonly", "--fieldset", "[header]");
-    }
-
-    @Test
     public void testInvalidCombination3() {
         exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("Field set option can not be used in combination with print ids or headers only options.");
+        exception.expectMessage("Field set option can not be used in combination with print ids option.");
         getParsedOptions("--printids", "--fieldset", "[header]");
     }
 
@@ -157,8 +143,9 @@ public class CommandLineOptionsTest {
 
     @Test
     public void testHeadersOnly() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("Headers only option has been removed.");
         ClientParameters params = getParsedOptions("--headersonly");
-        assertEquals("[header]", params.fieldSet);
     }
 
     @Test
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index 32e29ba51ec..570f38045e6 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -74,7 +74,7 @@ public class VdsVisitTestCase {
         // Short options testing (for options that do not collide with each other)
         String[] args = new String[] {
                 "-o", "654321",
-                "-e"
+                "-i"
         };
         VdsVisit.ArgumentParser parser = createMockArgumentParser();
         VdsVisit.VdsVisitParameters allParams = parser.parse(args);
@@ -84,7 +84,7 @@ public class VdsVisitTestCase {
         assertNotNull(params);
         assertEquals(654321, allParams.getFullTimeout());
         assertEquals(654321, params.getTimeoutMs());
-        assertEquals("[header]", params.getFieldSet());
+        assertEquals("[id]", params.getFieldSet());
     }
 
     @Test