diff --git a/inst/resources/cjfas.csl b/inst/resources/cjfas.csl
index fef2782a..d211e1d3 100644
--- a/inst/resources/cjfas.csl
+++ b/inst/resources/cjfas.csl
@@ -51,28 +51,21 @@
     </names>
   </macro>
   <macro name="author-short">
-    <choose>
-      <if type="report" variable="genre" match="all">
-        <text variable="publisher"/>
-      </if>
-      <else>
-        <names variable="author">
-          <name form="short" and="text" delimiter=", " initialize-with=". "/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <choose>
-              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-                <text variable="title" form="short" font-style="italic"/>
-              </if>
-              <else>
-                <text variable="title" form="short" quotes="true"/>
-              </else>
-            </choose>
-          </substitute>
-        </names>
-      </else>
-    </choose>
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
   </macro>
   <macro name="access">
     <choose>
@@ -251,10 +244,11 @@
       <choose>
         <if type="report" variable="genre" match="all">
           <group delimiter=". ">
-            <text variable="publisher"/>
-            <text macro="issued-month-year"/>
+            <text macro="author"/>
+            <text macro="issued-year"/>
             <text variable="title"/>
-            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+            <text variable="number-of-pages" suffix=" p."/>
             <text macro="stock-assessment-access"/>
           </group>
         </if>
diff --git a/tests/testthat/test-cjfas-csl.R b/tests/testthat/test-cjfas-csl.R
index e54f4fe6..d272580d 100644
--- a/tests/testthat/test-cjfas-csl.R
+++ b/tests/testthat/test-cjfas-csl.R
@@ -8,7 +8,29 @@ test_that("cjfas CSL includes stock-assessment report formatting", {
   )
 
   expect_match(csl, '<if type="report" variable="genre" match="all">', fixed = TRUE)
-  expect_match(csl, '<text macro="issued-month-year"/>', fixed = TRUE)
+  expect_match(
+    csl,
+    paste(
+      c(
+        '<if type="report" variable="genre" match="all">',
+        '          <group delimiter=". ">',
+        '            <text macro="author"/>',
+        '            <text macro="issued-year"/>',
+        '            <text variable="title"/>',
+        '            <text variable="publisher"/>',
+        '            <text variable="number-of-pages" suffix=" p."/>',
+        '            <text macro="stock-assessment-access"/>'
+      ),
+      collapse = "\n"
+    ),
+    fixed = TRUE
+  )
   expect_match(csl, '<text value="Accessible at"/>', fixed = TRUE)
-  expect_match(csl, '<text variable="publisher"/>', fixed = TRUE)
+  expect_false(
+    grepl(
+      '<if type="report" variable="genre" match="all">\n        <text variable="publisher"/>',
+      csl,
+      fixed = TRUE
+    )
+  )
 })