diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index eab990fb61..d15634df28 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -27,6 +27,7 @@ TODO - Release blockers - Must implement before this release can be finally fini
      and pmd-java:typeof).
 
 Fixed bug 3470274: Using Label for lines in XMLRenderer
+Fixed bug 3175710: NPE in InsufficientStringBufferDeclaration
 
 ---
 
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
index fc39879bfe..0b4626740d 100644
--- a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
+++ b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
@@ -80,4 +80,20 @@ public class Foo {
 }
      ]]></code>
     </test-code>
+    <test-code regressionTest="false">
+        <description><![CDATA[
+[3394465] False positive for UselessStringValueOf
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+class TestClass {
+
+  public void testMethod() {
+    char[] idFormat = {'0', '0', '0', '0', '0'};
+    String abc = "1" + String.valueOf(idFormat);
+    System.out.println(abc); // Output 100000
+ }
+}
+        ]]></code>
+    </test-code>
 </test-data>
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
index c85a45b48a..2a27296fa9 100644
--- a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
+++ b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
@@ -135,6 +135,17 @@ Interface with array declaration
         <code><![CDATA[
 public interface Foo {
  public String[] getArr();
+}
+     ]]></code>
+    </test-code>
+    <test-code regressionTest="false">
+        <description><![CDATA[
+3220206: False positive using a ternary operator
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public byte[] getContent() {
+  return this.content == null ? null : content.clone();
 }
      ]]></code>
     </test-code>