diff --git a/jbmc/regression/jbmc-strings/CharAtConstantEvaluation/Main.java b/jbmc/regression/jbmc-strings/CharAtConstantEvaluation/Main.java
deleted file mode 100644
index da18116ebb0..00000000000
--- a/jbmc/regression/jbmc-strings/CharAtConstantEvaluation/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Main {
-    public void constantCharAt() {
-        StringBuilder sb = new StringBuilder("abc");
-        char c = sb.charAt(1);
-        assert c == 'b';
-    }
-}
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/Main.java b/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/Main.java
deleted file mode 100644
index f4b40379536..00000000000
--- a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/Main.java
+++ /dev/null
@@ -1,39 +0,0 @@
-public class Main {
-    public void constantCompareToPass() {
-        String s1 = "ab";
-        String s2 = "abc";
-        assert s1.compareTo(s2) == -1;
-        assert s2.compareTo(s1) == 1;
-        s1 = "abc";
-        s2 = "abc";
-        assert s1.compareTo(s2) == 0;
-        s1 = "abyz";
-        s2 = "adyz";
-        assert s1.compareTo(s2) == -2;
-    }
-
-    public void constantCompareToFail1() {
-        String s1 = "ab";
-        String s2 = "abc";
-        assert s1.compareTo(s2) != -1;
-    }
-
-    public void constantCompareToFail2() {
-        String s1 = "ab";
-        String s2 = "abc";
-        assert s2.compareTo(s1) != 1;
-    }
-
-    public void constantCompareToFail3() {
-        String s1 = "abc";
-        String s2 = "abc";
-        assert s1.compareTo(s2) != 0;
-    }
-
-    public void constantCompareToFail4() {
-        String s1 = "abyz";
-        String s2 = "adyz";
-        assert s1.compareTo(s2) != -2;
-    }
-    
-}
diff --git a/jbmc/regression/jbmc-strings/CharAtConstantEvaluation/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/CharAtConstantEvaluation/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/Main.class
diff --git a/jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/Main.java
new file mode 100644
index 00000000000..5aa87820647
--- /dev/null
+++ b/jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/Main.java
@@ -0,0 +1,7 @@
+public class Main {
+  public void constantCharAt() {
+    StringBuilder sb = new StringBuilder("abc");
+    char c = sb.charAt(1);
+    assert c == 'b';
+  }
+}
diff --git a/jbmc/regression/jbmc-strings/CharAtConstantEvaluation/test.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/test.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CharAtConstantEvaluation/test.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCharAt/test.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/Main.class
diff --git a/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/Main.java
new file mode 100644
index 00000000000..d416c8f54fc
--- /dev/null
+++ b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/Main.java
@@ -0,0 +1,38 @@
+public class Main {
+  public void constantCompareToPass() {
+    String s1 = "ab";
+    String s2 = "abc";
+    assert s1.compareTo(s2) == -1;
+    assert s2.compareTo(s1) == 1;
+    s1 = "abc";
+    s2 = "abc";
+    assert s1.compareTo(s2) == 0;
+    s1 = "abyz";
+    s2 = "adyz";
+    assert s1.compareTo(s2) == -2;
+  }
+
+  public void constantCompareToFail1() {
+    String s1 = "ab";
+    String s2 = "abc";
+    assert s1.compareTo(s2) != -1;
+  }
+
+  public void constantCompareToFail2() {
+    String s1 = "ab";
+    String s2 = "abc";
+    assert s2.compareTo(s1) != 1;
+  }
+
+  public void constantCompareToFail3() {
+    String s1 = "abc";
+    String s2 = "abc";
+    assert s1.compareTo(s2) != 0;
+  }
+
+  public void constantCompareToFail4() {
+    String s1 = "abyz";
+    String s2 = "adyz";
+    assert s1.compareTo(s2) != -2;
+  }
+}
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail1.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail1.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail1.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail1.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail1_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail1_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail1_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail1_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail2.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail2.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail2.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail2.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail2_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail2_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail2_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail2_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail3.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail3.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail3.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail3.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail3_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail3_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail3_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail3_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail4.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail4.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail4.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail4.desc
diff --git a/jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail4_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail4_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/CompareToConstantEvaluation/test_fail4_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationCompareTo/test_fail4_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/Main.class
diff --git a/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/Main.java
new file mode 100644
index 00000000000..0dbb76c4744
--- /dev/null
+++ b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/Main.java
@@ -0,0 +1,13 @@
+public class Main {
+  public void constantEndsWithPass() {
+    String s1 = "abc";
+    String s2 = "bc";
+    assert s1.endsWith(s2);
+  }
+
+  public void constantEndsWithFail() {
+    String s1 = "abc";
+    String s2 = "d";
+    assert s1.endsWith(s2);
+  }
+}
diff --git a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_fail.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_fail.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_fail.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_fail.desc
diff --git a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_fail_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_fail_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_fail_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_fail_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_pass.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_pass.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/test_pass.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationEndsWith/test_pass.desc
diff --git a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/Main.class
diff --git a/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/Main.java
new file mode 100644
index 00000000000..5e70e916017
--- /dev/null
+++ b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/Main.java
@@ -0,0 +1,11 @@
+public class Main {
+  public void constantIsEmptyPass() {
+    String s = "";
+    assert s.isEmpty();
+  }
+
+  public void constantIsEmptyFail() {
+    String s = "abc";
+    assert s.isEmpty();
+  }
+}
diff --git a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_fail.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_fail.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_fail.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_fail.desc
diff --git a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_fail_vcc.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_fail_vcc.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_fail_vcc.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_fail_vcc.desc
diff --git a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_pass.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_pass.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/test_pass.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationIsEmpty/test_pass.desc
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/test.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/test.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation1/test.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend01/test.desc
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test1.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test1.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test1.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test1.desc
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test2.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test2.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test2.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test2.desc
diff --git a/jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test3.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test3.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderAppendConstantEvaluation2/test3.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderAppend02-WithEmptyString/test3.desc
diff --git a/jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/test.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/test.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringBuilderDefaultConstructorConstantEvaluation/test.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringBuilderDefaultConstructor/test.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/test.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/test.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation1/test.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation01/test.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test1.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test1.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test1.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test1.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test2.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test2.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test2.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test2.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test3.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test3.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation2/test3.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation02-WithEmptyString/test3.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/Main.class b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/Main.class
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/Main.class
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/Main.class
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/Main.java b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/Main.java
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/Main.java
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/Main.java
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test1.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test1.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test1.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test1.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test2.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test2.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test2.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test2.desc
diff --git a/jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test3.desc b/jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test3.desc
similarity index 100%
rename from jbmc/regression/jbmc-strings/StringConcatenationConstantEvaluation3/test3.desc
rename to jbmc/regression/jbmc-strings/ConstantEvaluationStringConcatenation03-NegativeScenarios/test3.desc
diff --git a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/Main.java b/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/Main.java
deleted file mode 100644
index dd357801483..00000000000
--- a/jbmc/regression/jbmc-strings/EndsWithConstantEvaluation/Main.java
+++ /dev/null
@@ -1,13 +0,0 @@
-public class Main {
-    public void constantEndsWithPass() {
-        String s1 = "abc";
-        String s2 = "bc";
-        assert s1.endsWith(s2);
-    }
-
-    public void constantEndsWithFail() {
-        String s1 = "abc";
-        String s2 = "d";
-        assert s1.endsWith(s2);
-    }
-}
diff --git a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/Main.java b/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/Main.java
deleted file mode 100644
index bc95d6430e2..00000000000
--- a/jbmc/regression/jbmc-strings/IsEmptyConstantEvaluation/Main.java
+++ /dev/null
@@ -1,12 +0,0 @@
-public class Main {
-    public void constantIsEmptyPass() {
-        String s = "";
-        assert s.isEmpty();
-    }
-
-    public void constantIsEmptyFail() {
-        String s = "abc";
-        assert s.isEmpty();
-    }
-
-}