diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java
index 4f60d06fa6..f829c0ee65 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java
@@ -20,6 +20,7 @@ public class AllMetricsTest extends SimpleAggregatorTst {
     public void setUp() {
         addRule(RULESET, "CycloTest");
         addRule(RULESET, "WmcTest");
+        addRule(RULESET, "CognitiveComplexityTest");
     }
 
 }
diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/CognitiveComplexityTestRule.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/CognitiveComplexityTestRule.java
new file mode 100644
index 0000000000..c7e9194967
--- /dev/null
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/CognitiveComplexityTestRule.java
@@ -0,0 +1,19 @@
+package net.sourceforge.pmd.lang.apex.metrics.impl;
+
+import net.sourceforge.pmd.lang.apex.metrics.api.ApexClassMetricKey;
+import net.sourceforge.pmd.lang.apex.metrics.api.ApexOperationMetricKey;
+
+/**
+ * @author Gwilym Kuiper
+ */
+public class CognitiveComplexityTestRule extends AbstractApexMetricTestRule {
+    @Override
+    protected ApexClassMetricKey getClassKey() {
+        return null;
+    }
+
+    @Override
+    protected ApexOperationMetricKey getOpKey() {
+        return ApexOperationMetricKey.COGNITIVE;
+    }
+}
diff --git a/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/metrics/impl/xml/CognitiveComplexityTest.xml b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/metrics/impl/xml/CognitiveComplexityTest.xml
new file mode 100644
index 0000000000..b5a09067e0
--- /dev/null
+++ b/pmd-apex/src/test/resources/net/sourceforge/pmd/lang/apex/metrics/impl/xml/CognitiveComplexityTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<test-data
+        xmlns="http://pmd.sourceforge.net/rule-tests"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
+    <test-code>
+        <description>If statements have complexity 1</description>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>'c__Foo#foo(Integer)' has value 1.</message>
+        </expected-messages>
+        <code>
+            <![CDATA[
+            class Foo {
+              string foo(integer n) {
+                if (n == 1) {
+                  return "one";
+                }
+
+                return "not one";
+              }
+            }
+            ]]>
+        </code>
+    </test-code>
+</test-data>
\ No newline at end of file
diff --git a/pmd-apex/src/test/resources/rulesets/apex/metrics_test.xml b/pmd-apex/src/test/resources/rulesets/apex/metrics_test.xml
index b9980f7571..cbb1c7324f 100644
--- a/pmd-apex/src/test/resources/rulesets/apex/metrics_test.xml
+++ b/pmd-apex/src/test/resources/rulesets/apex/metrics_test.xml
@@ -19,4 +19,9 @@
           class="net.sourceforge.pmd.lang.apex.metrics.impl.WmcTestRule">
     </rule>
 
+    <rule name="CognitiveComplexityTest"
+          message = "''{0}'' has value {1}."
+          class="net.sourceforge.pmd.lang.apex.metrics.impl.CognitiveComplexityTestRule">
+    </rule>
+
 </ruleset>