diff --git a/matlab/run_gdat_tests.m b/matlab/run_gdat_tests.m
index a656c778efe97dcc1fec9810cde4ee1406fc471b..31a02d141287817eb61515dacaee000237ac4f31 100644
--- a/matlab/run_gdat_tests.m
+++ b/matlab/run_gdat_tests.m
@@ -2,8 +2,9 @@ function [passed,results] = run_tbx_tests(test_case)
 % Test runner for generic toolbox tests
 
 if nargin==0 || isempty(test_case)
-  test_case = 'basic'; % default
+  test_case = 'basic-tcv'; % default
 end
+test_case = lower(test_case); % lowercase
 
 if nargin < 2
   coverage_report = false; % default
@@ -16,7 +17,6 @@ needCOV=~isempty(getenv('GITLAB_CI')) && ~verLessThan('matlab','9.6.0') || cover
 
 %% Default outputs
 passed=false; results=[]; % default outputs
-test_case = lower(test_case); % lowercase
  
 %% Import some classes we need
 import matlab.unittest.selectors.HasTag;
@@ -45,7 +45,10 @@ end
 testspath = fullfile(tbxpath,'tests');
 
 lastwarn('','');
-suite_all = matlab.unittest.TestSuite.fromFolder(testspath);
+
+suite_all = [matlab.unittest.TestSuite.fromClass(?fullfile(testspath,test_requestnames_tcv)),...
+             matlab.unittest.TestSuite.fromClass(?fullfile(testspath,test_tcv_get_ids))];
+
 [~,s] = lastwarn();
 if isequal(s,'MATLAB:unittest:TestSuite:FileExcluded')
   fprintf('File excluded during test suite creation - possible syntax errors in a test class');