diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
index ba818eb40..5c633817e 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
@@ -63,7 +63,7 @@ describe('PortfolioCalculator', () => {
 
   beforeAll(() => {
     activityDtos = loadActivityExportFile(
-      join(__dirname, '../../../../../../../test/import/ok-btceur.json')
+      join(__dirname, '../../../../../../../test/import/ok/btceur.json')
     );
   });
 
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
index cf07eff97..4e84ba05c 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
@@ -63,7 +63,7 @@ describe('PortfolioCalculator', () => {
 
   beforeAll(() => {
     activityDtos = loadActivityExportFile(
-      join(__dirname, '../../../../../../../test/import/ok-btcusd.json')
+      join(__dirname, '../../../../../../../test/import/ok/btcusd.json')
     );
   });
 
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
index 92a3e33ed..2d66695a2 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@@ -65,7 +65,7 @@ describe('PortfolioCalculator', () => {
     activityDtos = loadActivityExportFile(
       join(
         __dirname,
-        '../../../../../../../test/import/ok-novn-buy-and-sell-partially.json'
+        '../../../../../../../test/import/ok/novn-buy-and-sell-partially.json'
       )
     );
   });
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
index 3d4760be7..1a090496a 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts
@@ -65,7 +65,7 @@ describe('PortfolioCalculator', () => {
     activityDtos = loadActivityExportFile(
       join(
         __dirname,
-        '../../../../../../../test/import/ok-novn-buy-and-sell.json'
+        '../../../../../../../test/import/ok/novn-buy-and-sell.json'
       )
     );
   });
diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
index bba859fc2..f5a3612ac 100644
--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html
@@ -90,13 +90,13 @@
                   >The following file formats are supported:</span
                 >
                 <a
-                  href="https://github.com/ghostfolio/ghostfolio/blob/main/test/import/ok.csv"
+                  href="https://github.com/ghostfolio/ghostfolio/blob/main/test/import/ok/sample.csv"
                   target="_blank"
                   >CSV</a
                 >
                 <span class="mx-1" i18n>or</span>
                 <a
-                  href="https://github.com/ghostfolio/ghostfolio/blob/main/test/import/ok.json"
+                  href="https://github.com/ghostfolio/ghostfolio/blob/main/test/import/ok/sample.json"
                   target="_blank"
                   >JSON</a
                 >
diff --git a/test/import/invalid-currency.csv b/test/import/not-ok/invalid-currency.csv
similarity index 100%
rename from test/import/invalid-currency.csv
rename to test/import/not-ok/invalid-currency.csv
diff --git a/test/import/invalid-data-source.json b/test/import/not-ok/invalid-data-source.json
similarity index 100%
rename from test/import/invalid-data-source.json
rename to test/import/not-ok/invalid-data-source.json
diff --git a/test/import/invalid-date-before-min.json b/test/import/not-ok/invalid-date-before-min.json
similarity index 100%
rename from test/import/invalid-date-before-min.json
rename to test/import/not-ok/invalid-date-before-min.json
diff --git a/test/import/invalid-date-yy.csv b/test/import/not-ok/invalid-date-yy.csv
similarity index 100%
rename from test/import/invalid-date-yy.csv
rename to test/import/not-ok/invalid-date-yy.csv
diff --git a/test/import/invalid-date.json b/test/import/not-ok/invalid-date.json
similarity index 100%
rename from test/import/invalid-date.json
rename to test/import/not-ok/invalid-date.json
diff --git a/test/import/invalid-fee.csv b/test/import/not-ok/invalid-fee.csv
similarity index 100%
rename from test/import/invalid-fee.csv
rename to test/import/not-ok/invalid-fee.csv
diff --git a/test/import/invalid-multi-line.csv b/test/import/not-ok/invalid-multi-line.csv
similarity index 100%
rename from test/import/invalid-multi-line.csv
rename to test/import/not-ok/invalid-multi-line.csv
diff --git a/test/import/invalid-symbol-btc-usd.csv b/test/import/not-ok/invalid-symbol-btc-usd.csv
similarity index 100%
rename from test/import/invalid-symbol-btc-usd.csv
rename to test/import/not-ok/invalid-symbol-btc-usd.csv
diff --git a/test/import/invalid-symbol.csv b/test/import/not-ok/invalid-symbol.csv
similarity index 100%
rename from test/import/invalid-symbol.csv
rename to test/import/not-ok/invalid-symbol.csv
diff --git a/test/import/invalid-symbol.json b/test/import/not-ok/invalid-symbol.json
similarity index 100%
rename from test/import/invalid-symbol.json
rename to test/import/not-ok/invalid-symbol.json
diff --git a/test/import/unavailable-exchange-rate.json b/test/import/not-ok/unavailable-exchange-rate.json
similarity index 100%
rename from test/import/unavailable-exchange-rate.json
rename to test/import/not-ok/unavailable-exchange-rate.json
diff --git a/test/import/unexpected-format.json b/test/import/not-ok/unexpected-format.json
similarity index 100%
rename from test/import/unexpected-format.json
rename to test/import/not-ok/unexpected-format.json
diff --git a/test/import/ok-500-activities.json b/test/import/ok/500-activities.json
similarity index 100%
rename from test/import/ok-500-activities.json
rename to test/import/ok/500-activities.json
diff --git a/test/import/ok-btceur.json b/test/import/ok/btceur.json
similarity index 100%
rename from test/import/ok-btceur.json
rename to test/import/ok/btceur.json
diff --git a/test/import/ok-btcusd.csv b/test/import/ok/btcusd.csv
similarity index 100%
rename from test/import/ok-btcusd.csv
rename to test/import/ok/btcusd.csv
diff --git a/test/import/ok-btcusd.json b/test/import/ok/btcusd.json
similarity index 100%
rename from test/import/ok-btcusd.json
rename to test/import/ok/btcusd.json
diff --git a/test/import/ok-derived-currency.json b/test/import/ok/derived-currency.json
similarity index 100%
rename from test/import/ok-derived-currency.json
rename to test/import/ok/derived-currency.json
diff --git a/test/import/ok-novn-buy-and-sell-partially.json b/test/import/ok/novn-buy-and-sell-partially.json
similarity index 100%
rename from test/import/ok-novn-buy-and-sell-partially.json
rename to test/import/ok/novn-buy-and-sell-partially.json
diff --git a/test/import/ok-novn-buy-and-sell.json b/test/import/ok/novn-buy-and-sell.json
similarity index 100%
rename from test/import/ok-novn-buy-and-sell.json
rename to test/import/ok/novn-buy-and-sell.json
diff --git a/test/import/ok.csv b/test/import/ok/sample.csv
similarity index 100%
rename from test/import/ok.csv
rename to test/import/ok/sample.csv
diff --git a/test/import/ok.json b/test/import/ok/sample.json
similarity index 100%
rename from test/import/ok.json
rename to test/import/ok/sample.json
diff --git a/test/import/ok-vti-buy-long-history.json b/test/import/ok/vti-buy-long-history.json
similarity index 100%
rename from test/import/ok-vti-buy-long-history.json
rename to test/import/ok/vti-buy-long-history.json
diff --git a/test/import/ok-vti-buy-on-ibkr.csv b/test/import/ok/vti-buy-on-ibkr.csv
similarity index 100%
rename from test/import/ok-vti-buy-on-ibkr.csv
rename to test/import/ok/vti-buy-on-ibkr.csv
diff --git a/test/import/ok-without-accounts.json b/test/import/ok/without-accounts.json
similarity index 100%
rename from test/import/ok-without-accounts.json
rename to test/import/ok/without-accounts.json