diff --git a/changes.d/2100.feat.md b/changes.d/2100.feat.md
new file mode 100644
index 000000000..9a40cc43d
--- /dev/null
+++ b/changes.d/2100.feat.md
@@ -0,0 +1 @@
+Adding CPU time and Max RSS to Analysis Tools
diff --git a/src/components/cylc/analysis/AnalysisTable.vue b/src/components/cylc/analysis/AnalysisTable.vue
index d122f3ccd..d68d717e4 100644
--- a/src/components/cylc/analysis/AnalysisTable.vue
+++ b/src/components/cylc/analysis/AnalysisTable.vue
@@ -56,7 +56,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  formatHeader,
+  formatChartLabels,
+} from '@/utils/tasks'
 import {
   initialOptions,
   updateInitialOptionsEvent,
@@ -128,50 +132,82 @@ export default {
   computed: {
     shownHeaders () {
       const times = upperFirst(this.timingOption)
-      const timingHeaders = [
-        {
-          title: `Mean T-${times}`,
-          key: `mean${times}Time`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Std Dev T-${times}`,
-          key: `stdDev${times}Time`,
-          formatter: formatDuration,
-          allowZeros: true
-        },
-        {
-          title: `Min T-${times}`,
-          key: `min${times}Time`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Q1 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.0`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Median T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.1`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Q3 T-${times}`,
-          key: `${times.toLowerCase()}Quartiles.2`,
-          formatter: formatDuration,
-          allowZeros: false
-        },
-        {
-          title: `Max T-${times}`,
-          key: `max${times}Time`,
-          formatter: formatDuration,
-          allowZeros: false
+      const timingHeaders = []
+      // Check if there are any stats to show
+      let stats = false
+      for (let i = 0; i < this.tasks.length; i++) {
+        if (this.tasks[i].count > 1) {
+          stats = true
+          break
         }
-      ]
+      }
+      if (stats) {
+        timingHeaders.push(
+          {
+            title: `Mean ${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Min ${formatChartLabels(times)}`,
+            key: `${formatHeader('min', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q1 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.0`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Median ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.1`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Q3 ${formatChartLabels(times)}`,
+            key: `${formatHeader('quartiles', times)}Quartiles.2`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          },
+          {
+            title: `Max ${formatChartLabels(times)}`,
+            key: `${formatHeader('max', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          }
+        )
+      } else {
+        timingHeaders.push(
+          {
+            title: `${formatChartLabels(times)}`,
+            key: `${formatHeader('mean', times)}`,
+            formatter: formatDuration,
+            allowZeros: false,
+            timingOption: this.timingOption
+          }
+        )
+      }
+
+      // Don't show std dev for cpuTime or maxRss
+      if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss' && stats) {
+        timingHeaders.push({
+          title: `Std Dev ${times}`,
+          key: `${formatHeader('stdDev', times)}`,
+          formatter: formatDuration,
+          allowZeros: true,
+          timingOption: this.timingOption
+        })
+      }
       return this.headers.concat(timingHeaders)
     }
   },
@@ -186,7 +222,7 @@ export default {
         value = value[index]
       }
       if (header.formatter) {
-        return header.formatter(value, header.allowZeros)
+        return header.formatter(value, header.allowZeros, this.timingOption)
       }
       return value
     }
diff --git a/src/components/cylc/analysis/BoxPlot.vue b/src/components/cylc/analysis/BoxPlot.vue
index 755fc3202..306124b91 100644
--- a/src/components/cylc/analysis/BoxPlot.vue
+++ b/src/components/cylc/analysis/BoxPlot.vue
@@ -65,7 +65,11 @@ import {
   mdiSortVariant,
 } from '@mdi/js'
 import { upperFirst } from 'lodash'
-import { formatDuration } from '@/utils/tasks'
+import {
+  formatDuration,
+  getTimingOption,
+  formatChartLabels
+} from '@/utils/tasks'
 import { useReducedAnimation } from '@/composables/localStorage'
 import {
   initialOptions,
@@ -165,11 +169,11 @@ export default {
       },
       tooltip: {
         custom ({ seriesIndex, dataPointIndex, w }) {
-          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true)
-          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true)
-          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true)
-          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true)
-          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true)
+          const max = formatDuration(w.globals.seriesCandleC[seriesIndex][dataPointIndex], true, props.timingOption)
+          const q3 = formatDuration(w.globals.seriesCandleL[seriesIndex][dataPointIndex], true, props.timingOption)
+          const med = formatDuration(w.globals.seriesCandleM[seriesIndex][dataPointIndex], true, props.timingOption)
+          const q1 = formatDuration(w.globals.seriesCandleH[seriesIndex][dataPointIndex], true, props.timingOption)
+          const min = formatDuration(w.globals.seriesCandleO[seriesIndex][dataPointIndex], true, props.timingOption)
           return `
             <div class="pa-2">
               <div>Maximum: ${max}</div>
@@ -194,10 +198,10 @@ export default {
       },
       xaxis: {
         title: {
-          text: `${upperFirst(props.timingOption)} time`,
+          text: `${formatChartLabels(props.timingOption)}`,
         },
         labels: {
-          formatter: (value) => formatDuration(value, true)
+          formatter: (value) => formatDuration(value, true, props.timingOption)
         },
       },
     }))
@@ -221,11 +225,11 @@ export default {
         data.push({
           x: sortedTasks[i].name,
           y: [
-            sortedTasks[i][`min${upperFirst(this.timingOption)}Time`],
+            sortedTasks[i][`min${upperFirst(getTimingOption(this.timingOption))}`],
             sortedTasks[i][`${this.timingOption}Quartiles`][0],
             sortedTasks[i][`${this.timingOption}Quartiles`][1],
             sortedTasks[i][`${this.timingOption}Quartiles`][2],
-            sortedTasks[i][`max${upperFirst(this.timingOption)}Time`],
+            sortedTasks[i][`max${upperFirst(getTimingOption(this.timingOption))}`],
           ],
         })
       }
@@ -241,10 +245,10 @@ export default {
         { title: 'Task name', value: 'name' },
         { title: 'Platform', value: 'platform' },
         { title: 'Count', value: 'count' },
-        { title: `Mean ${this.timingOption} time`, value: `mean${upperFirst(this.timingOption)}Time` },
-        { title: `Median ${this.timingOption} time`, value: `median${upperFirst(this.timingOption)}Time` },
-        { title: `Min ${this.timingOption} time`, value: `min${upperFirst(this.timingOption)}Time` },
-        { title: `Max ${this.timingOption} time`, value: `max${upperFirst(this.timingOption)}Time` },
+        { title: `Mean ${formatChartLabels(this.timingOption)}`, value: `mean${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Median ${formatChartLabels(this.timingOption)}`, value: `median${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Min ${formatChartLabels(this.timingOption)}`, value: `min${upperFirst(getTimingOption(this.timingOption))}` },
+        { title: `Max ${formatChartLabels(this.timingOption)}`, value: `max${upperFirst(getTimingOption(this.timingOption))}` },
       ]
     },
   },
diff --git a/src/components/cylc/analysis/TimeSeries.vue b/src/components/cylc/analysis/TimeSeries.vue
index 7b13cf0c9..ae530e038 100644
--- a/src/components/cylc/analysis/TimeSeries.vue
+++ b/src/components/cylc/analysis/TimeSeries.vue
@@ -93,11 +93,14 @@ import {
   difference,
   pick,
   union,
-  uniq,
-  upperFirst
+  uniq
 } from 'lodash'
 import gql from 'graphql-tag'
-import { formatDuration } from '@/utils/tasks'
+import {
+  getTimingOption,
+  formatDuration,
+  formatChartLabels
+} from '@/utils/tasks'
 import {
   mdiDownload,
   mdiRefresh,
@@ -119,7 +122,9 @@ const jobFields = [
   'totalTime',
   'queueTime',
   'runTime',
-  'startedTime'
+  'startedTime',
+  'maxRss',
+  'cpuTime'
 ]
 
 /** The one-off query which retrieves historical job timing statistics */
@@ -284,7 +289,7 @@ export default {
             const currentStartedTime = seriesData[job.name].data[job.cyclePoint].startedTime
             // Only add data if this job was run more recently than any existing data
             if (currentStartedTime === undefined || job.startedTime.localeCompare(currentStartedTime) === 1) {
-              time = job[`${this.timingOption}Time`]
+              time = job[getTimingOption(this.timingOption)]
               Object.assign(seriesData[job.name].data[job.cyclePoint], {
                 x: job.cyclePoint,
                 y: time,
@@ -366,7 +371,7 @@ export default {
               if (!value) {
                 return null
               }
-              const y = formatDuration(value, true)
+              const y = formatDuration(value, true, this.timingOption)
               const platform = this.series[seriesIndex].data[dataPointIndex].platform
               return `${y} (${platform})`
             }
@@ -384,12 +389,10 @@ export default {
           forceNiceScale: true,
           min: this.showOrigin ? 0 : undefined,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: function (value) {
-              return formatDuration(value, true)
-            }
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
         },
       }
@@ -445,12 +448,10 @@ export default {
         yaxis: {
           tickAmount: 3,
           title: {
-            text: upperFirst(this.timingOption) + ' time',
+            text: formatChartLabels(this.timingOption),
           },
           labels: {
-            formatter: function (value) {
-              return formatDuration(value, true)
-            }
+            formatter: (value) => formatDuration(value, true, this.timingOption)
           },
           min: this.showOrigin ? 0 : undefined
         },
diff --git a/src/services/mock/json/analysisQuery.json b/src/services/mock/json/analysisQuery.json
index 583d20a6e..fd4da6e76 100644
--- a/src/services/mock/json/analysisQuery.json
+++ b/src/services/mock/json/analysisQuery.json
@@ -19,7 +19,19 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 9,
           "queueQuartiles": [10, 11, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 200000,
+          "meanMaxRss": 100000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 50000,
+          "maxRssQuartiles": [55000, 100000, 150000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 10000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 20000, 30000],
+          "totalOfTotals": 420000
         },
         {
           "name": "eventually_succeeded",
@@ -39,7 +51,19 @@
           "stdDevQueueTime": 2,
           "minQueueTime": 8,
           "queueQuartiles": [9, 10, 11],
-          "maxQueueTime": 11
+          "maxQueueTime": 11,
+          "maxMaxRss": 300000,
+          "meanMaxRss": 200000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 60000,
+          "maxRssQuartiles": [66000, 200000, 250000],
+          "maxCpuTime": 20000,
+          "meanCpuTime": 10000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 1000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000
         },
         {
           "name": "waiting",
@@ -59,7 +83,19 @@
           "stdDevQueueTime": 3,
           "minQueueTime": 10,
           "queueQuartiles": [10, 12, 13],
-          "maxQueueTime": 14
+          "maxQueueTime": 14,
+          "maxMaxRss": 400000,
+          "meanMaxRss": 300000 ,
+          "stdDevMaxRss": 5,
+          "minMaxRss": 70000,
+          "maxRssQuartiles": [77000, 300000, 350000],
+          "maxCpuTime": 30000,
+          "meanCpuTime": 20000,
+          "stdDevCpuTime": 5,
+          "minCpuTime": 9000,
+          "totalCpuTime": 200000,
+          "cpuTimeQuartiles": [10000, 11000, 13000],
+          "totalOfTotals": 420000
         }
       ]
     }
@@ -74,7 +110,9 @@
           "totalTime": 60,
           "queueTime": 2,
           "runTime": 58,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -83,7 +121,9 @@
           "totalTime": 61,
           "queueTime": 2,
           "runTime": 59,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "succeeded",
@@ -92,7 +132,9 @@
           "totalTime": 62,
           "queueTime": 2,
           "runTime": 60,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -101,7 +143,9 @@
           "totalTime": 41,
           "queueTime": 2,
           "runTime": 39,
-          "startedTime": "2023-01-01T01:00:00Z"
+          "startedTime": "2023-01-01T01:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -110,7 +154,9 @@
           "totalTime": 40,
           "queueTime": 2,
           "runTime": 38,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "eventually_succeeded",
@@ -119,7 +165,9 @@
           "totalTime": 42,
           "queueTime": 2,
           "runTime": 40,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -128,7 +176,9 @@
           "totalTime": 50,
           "queueTime": 2,
           "runTime": 48,
-          "startedTime": "2023-01-01T00:00:00Z"
+          "startedTime": "2023-01-01T00:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -137,7 +187,10 @@
           "totalTime": 4,
           "queueTime": 2,
           "runTime": 2,
-          "startedTime": "2023-01-01T02:01:00Z"},
+          "startedTime": "2023-01-01T02:01:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
+        },
         {
           "name": "waiting",
           "platform": "platform_2",
@@ -145,7 +198,9 @@
           "totalTime": 52,
           "queueTime": 2,
           "runTime": 50,
-          "startedTime": "2023-01-01T02:02:00Z"
+          "startedTime": "2023-01-01T02:02:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         },
         {
           "name": "waiting",
@@ -154,7 +209,9 @@
           "totalTime": 3,
           "queueTime": 2,
           "runTime": 1,
-          "startedTime": "2023-01-01T02:00:00Z"
+          "startedTime": "2023-01-01T02:00:00Z",
+          "maxRss": 1000,
+          "cpuTime": 50000
         }
       ]
     }
diff --git a/src/utils/tasks.js b/src/utils/tasks.js
index bf6cd4734..378f4c521 100644
--- a/src/utils/tasks.js
+++ b/src/utils/tasks.js
@@ -17,7 +17,9 @@
 
 import TaskState from '@/model/TaskState.model'
 import { TASK_OUTPUT_NAMES } from '@/model/TaskOutput.model'
-
+import {
+  upperFirst
+} from 'lodash'
 /**
  * States used when the parent is stopped.
  * @type {TaskState[]}
@@ -96,28 +98,83 @@ export function jobMessageOutputs (jobNode) {
  * 00:00:00, rather than undefined
  * @return {string=} Formatted duration
  */
-export function formatDuration (dur, allowZeros = false) {
-  if (dur || (dur === 0 && allowZeros === true)) {
-    const seconds = dur % 60
-    const minutes = ((dur - seconds) / 60) % 60
-    const hours = ((dur - minutes * 60 - seconds) / 3600) % 24
-    const days = (dur - hours * 3600 - minutes * 60 - seconds) / 86400
+export function formatDuration (value, allowZeros = false, timingOption = true) {
+  // Times are formatted as HH:MM:SS
+  if (timingOption === 'queue' || timingOption === 'total' || timingOption === 'run' || timingOption === 'cpuTime' || timingOption === true) {
+    if (value || (value === 0 && allowZeros === true)) {
+      // Convert CPU time to seconds
+      if (timingOption === 'cpuTime') {
+        value = value / 1000
+      }
+      const seconds = value % 60
+      const minutes = ((value - seconds) / 60) % 60
+      const hours = ((value - minutes * 60 - seconds) / 3600) % 24
+      const days = (value - hours * 3600 - minutes * 60 - seconds) / 86400
 
-    let dayss = ''
-    if (days > 0) {
-      dayss = days.toString() + 'd '
-    }
+      let dayss = ''
+      if (days > 0) {
+        dayss = days.toString() + 'd '
+      }
 
-    return dayss +
-      hours.toString().padStart(2, '0') +
-      ':' + minutes.toString().padStart(2, '0') +
-      ':' + Math.round(seconds).toString().padStart(2, '0')
+      return dayss +
+        hours.toString().padStart(2, '0') +
+        ':' + minutes.toString().padStart(2, '0') +
+        ':' + Math.round(seconds).toString().padStart(2, '0')
+    }
+  // If memory value passed
+  } else if (timingOption === 'maxRss') {
+    if (value < 5000) {
+      const kilobytes = value
+      return kilobytes.toPrecision(3) + ' KB'
+    } else if (value / 1024 < 1000) {
+      const megabytes = value / 1024
+      return megabytes.toPrecision(3) + ' MB'
+    } else {
+      const gigabytes = value / 1048576
+      return gigabytes.toPrecision(3) + ' GB'
+    }
   }
   // the meanElapsedTime can be 0/undefined (i.e. task has not run before)
   // return "undefined" rather than a number for these cases
   return undefined
 }
 
+export function formatChartLabels (timingOption) {
+  // Create correct labels for the charts
+  if (timingOption === 'maxRss' || timingOption === 'MaxRss') {
+    return 'Max RSS'
+  } else if (timingOption === 'cpuTime' || timingOption === 'CpuTime') {
+    return 'CPU Time'
+  } else {
+    return upperFirst(timingOption) + ' Time'
+  }
+}
+
+export function getTimingOption (timingOption) {
+  // Create correct timing option for the charts
+  if (timingOption === 'maxRss' || timingOption === 'cpuTime') {
+    return timingOption
+  } else {
+    return timingOption + 'Time'
+  }
+}
+
+export function formatHeader (statistic, timingOption) {
+  if (timingOption === 'MaxRss' || timingOption === 'CpuTime' || timingOption === 'totalCpuTime') {
+    if (statistic === 'quartiles') {
+      return timingOption.charAt(0).toLowerCase() + timingOption.slice(1)
+    } else {
+      return statistic + timingOption
+    }
+  } else {
+    if (statistic === 'quartiles') {
+      return timingOption.toLowerCase()
+    } else {
+      return statistic + timingOption + 'Time'
+    }
+  }
+}
+
 export function dtMean (taskNode) {
   // Convert to an easily read duration format:
   const dur = taskNode.node?.task?.meanElapsedTime
diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue
index 4b9d46923..78c082e72 100644
--- a/src/views/Analysis.vue
+++ b/src/views/Analysis.vue
@@ -17,6 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <template>
   <div class="c-analysis">
+    <v-skeleton-loader
+      v-if="!Object.keys(callback.tasks).length"
+      type="table"
+      class="align-content-start"
+    />
     <v-container
       fluid
       class="pa-2"
@@ -108,8 +113,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <v-icon :icon="$options.icons.mdiRefresh" />
             <v-tooltip>Refresh data</v-tooltip>
           </v-btn>
+          <v-chip
+            location="right"
+            v-if="timingOption === 'cpuTime'"
+          >
+            Total CPU Time Of Suite {{ formatDuration(tasks[0].totalOfTotals, false, 'cpuTime') }}
+          </v-chip>
+          <!-- Box plot sort input teleports here -->
         </v-defaults-provider>
-        <!-- Box plot sort input teleports here -->
       </div>
       <AnalysisTable
         v-if="chartType === 'table'"
@@ -143,6 +154,7 @@ import {
   pick,
 } from 'lodash'
 import gql from 'graphql-tag'
+import { formatDuration } from '@/utils/tasks'
 import graphqlMixin from '@/mixins/graphql'
 import {
   initialOptions,
@@ -183,7 +195,19 @@ const taskFields = [
   'stdDevQueueTime',
   'minQueueTime',
   'queueQuartiles',
-  'maxQueueTime'
+  'maxQueueTime',
+  'maxMaxRss',
+  'meanMaxRss',
+  'stdDevMaxRss',
+  'minMaxRss',
+  'maxRssQuartiles',
+  'maxCpuTime',
+  'meanCpuTime',
+  'stdDevCpuTime',
+  'minCpuTime',
+  'totalCpuTime',
+  'cpuTimeQuartiles',
+  'totalOfTotals'
 ]
 
 /** The one-off query which retrieves historical task timing statistics */
@@ -343,7 +367,8 @@ export default {
         this.callback.onAdded(ret.data)
       },
       200 // only re-run this once every 0.2 seconds
-    )
+    ),
+    formatDuration
   },
 
   icons: {
@@ -357,6 +382,8 @@ export default {
     { value: 'totalTimes', title: 'Total times' },
     { value: 'runTimes', title: 'Run times' },
     { value: 'queueTimes', title: 'Queue times' },
+    { value: 'maxRss', title: 'Max RSS' },
+    { value: 'cpuTime', title: 'CPU Time' },
   ],
 }
 </script>
diff --git a/tests/e2e/specs/analysis.cy.js b/tests/e2e/specs/analysis.cy.js
index fa880f492..e129bed7d 100644
--- a/tests/e2e/specs/analysis.cy.js
+++ b/tests/e2e/specs/analysis.cy.js
@@ -135,6 +135,20 @@ describe('Analysis view', () => {
         cy
           .get('.c-analysis table > tbody > tr')
           .should('have.length', numTasks)
+        // Show Max RSS
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
       })
 
       it('Should filter by task name, platform and timings', () => {
@@ -207,6 +221,43 @@ describe('Analysis view', () => {
           .should('have.length', 1)
           .should('be.visible')
       })
+      it('Should show Max RSS', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('Max RSS')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('MB')
+          .should('be.visible')
+        cy
+          .get('.c-analysis table > tbody > tr')
+          .should('have.length', numTasks)
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('not.exist')
+      })
+      it('Should show CPU Time', () => {
+        cy
+          .get('#c-analysis-filter-task-timings')
+          .click({ force: true })
+        cy
+          .get('.v-list-item')
+          .contains('CPU Time')
+          .click({ force: true })
+        cy
+          .get('td')
+          .contains('00:00:10')
+          .should('be.visible')
+        cy
+          .get('.v-chip__content')
+          .should('exist')
+          .contains('CPU Time')
+      })
     })
   })
 
@@ -232,6 +283,38 @@ describe('Analysis view', () => {
         .get('.vue-apexcharts')
         .should('not.exist')
     })
+    it('Should show Max RSS', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('Max RSS')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('MB')
+        .should('be.visible')
+    })
+    it('Should show CPU Time', () => {
+      cy
+        .get('#c-analysis-filter-task-timings')
+        .click({ force: true })
+      cy
+        .get('.v-list-item')
+        .contains('CPU Time')
+        .click({ force: true })
+      cy
+        .get('.apexcharts-yaxis-label')
+        .should('have.length', numTasks)
+      cy
+        .get('.apexcharts-xaxis-label')
+        .contains('00:00:00')
+        .should('be.visible')
+    })
 
     it('refreshes without getting bogus apexcharts error', () => {
       // https://github.com/apexcharts/vue3-apexcharts/issues/79