Index: src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java
===================================================================
--- src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java	(revision 16022)
+++ src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java	(working copy)
@@ -59,17 +59,6 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.xwiki.rendering.macro.box.AbstractBoxMacro#getClassProperty()
-     */
-    @Override
-    protected String getClassProperty()
-    {
-        return "code";
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
      * @see org.xwiki.rendering.internal.macro.box.DefaultBoxMacro#parseContent(org.xwiki.rendering.macro.box.BoxMacroParameters,
      *      java.lang.String, org.xwiki.rendering.transformation.MacroTransformationContext)
      */
Index: src/main/java/org/xwiki/rendering/macro/code/CodeMacroParameters.java
===================================================================
--- src/main/java/org/xwiki/rendering/macro/code/CodeMacroParameters.java	(revision 16022)
+++ src/main/java/org/xwiki/rendering/macro/code/CodeMacroParameters.java	(working copy)
@@ -21,6 +21,7 @@
 
 import org.xwiki.rendering.macro.box.BoxMacroParameters;
 import org.xwiki.rendering.macro.descriptor.ParameterDescription;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * Parameters for the {@link org.xwiki.rendering.internal.macro.code.CodeMacro} Macro.
@@ -41,6 +42,14 @@
     private String language;
 
     /**
+     * Constructor which initializes the cssClass property of the box.
+     */
+    public CodeMacroParameters() {
+        if (StringUtils.isEmpty(this.getCssClass())) {
+            this.setCssClass("code");
+        }
+    }
+    /**
      * @param language the language identifier.
      */
     @ParameterDescription("the language identifier (java, python, etc.)")