diff --git a/ui/tests/acceptance/client-history-test.js b/ui/tests/acceptance/client-history-test.js
index cb575bb91e..b693af9774 100644
--- a/ui/tests/acceptance/client-history-test.js
+++ b/ui/tests/acceptance/client-history-test.js
@@ -193,12 +193,13 @@ module('Acceptance | clients history tab', function (hooks) {
     );
 
     // query custom end month
+    const customEndDate = subMonths(NEW_DATE, 3);
     await click(SELECTORS.rangeDropdown);
     await click('[data-test-show-calendar]');
-    if (parseInt(find('[data-test-display-year]').innerText) < NEW_DATE.getFullYear()) {
-      await click('[data-test-future-year]');
+    if (parseInt(find('[data-test-display-year]').innerText) !== customEndDate.getFullYear()) {
+      await click('[data-test-previous-year]');
     }
-    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[LAST_MONTH.getMonth() - 2]}]`));
+    await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[customEndDate.getMonth()]}]`));
 
     assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area');
     assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block');
@@ -218,8 +219,8 @@ module('Acceptance | clients history tab', function (hooks) {
     // query for single, historical month
     await click(SELECTORS.rangeDropdown);
     await click('[data-test-show-calendar]');
-    if (parseInt(find('[data-test-display-year]').innerText) < NEW_DATE.getFullYear()) {
-      await click('[data-test-future-year]');
+    if (parseInt(find('[data-test-display-year]').innerText) !== UPGRADE_DATE.getFullYear()) {
+      await click('[data-test-previous-year]');
     }
     await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}]`));
 
diff --git a/ui/tests/integration/components/date-dropdown-test.js b/ui/tests/integration/components/date-dropdown-test.js
index c960c48f4e..b2952ee58a 100644
--- a/ui/tests/integration/components/date-dropdown-test.js
+++ b/ui/tests/integration/components/date-dropdown-test.js
@@ -1,5 +1,5 @@
 /* eslint qunit/no-conditional-assertions: "warn" */
-import { module, test } from 'qunit';
+import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { click, render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
@@ -43,7 +43,8 @@ module('Integration | Component | date-dropdown', function (hooks) {
     assert.dom('[data-test-date-dropdown-submit]').hasText('Save', 'button renders passed in text');
   });
 
-  test('it renders dropdown and selects month and year', async function (assert) {
+  // skip until https://github.com/hashicorp/vault/pull/17575 is merged which refactors these tests and fixes flakiness
+  skip('it renders dropdown and selects month and year', async function (assert) {
     assert.expect(27);
     const parentAction = (month, year) => {
       assert.strictEqual(month, 'January', 'sends correct month to parent callback');
@@ -92,7 +93,7 @@ module('Integration | Component | date-dropdown', function (hooks) {
     await click(submitButton);
   });
 
-  test('it disables correct years when selecting month first', async function (assert) {
+  skip('it disables correct years when selecting month first', async function (assert) {
     assert.expect(60);
     await render(hbs`
     <div class="is-flex-align-baseline">
@@ -128,7 +129,7 @@ module('Integration | Component | date-dropdown', function (hooks) {
     }
   });
 
-  test('it disables correct months when selecting year first', async function (assert) {
+  skip('it disables correct months when selecting year first', async function (assert) {
     assert.expect(60);
     await render(hbs`
     <div class="is-flex-align-baseline">