diff --git a/SConscript b/SConscript
index bc62bbdb447..19be21e23e9 100644
--- a/SConscript
+++ b/SConscript
@@ -23,7 +23,6 @@ env.Alias('controller/test', [
     'controller/src/query_engine:test',
     'controller/src/schema:test',
     'controller/src/xmpp:test',
-    'controller/src/api-lib:test',
     'controller/src/config/api-server:test',
     'controller/src/config/schema-transformer:test',
 ])
@@ -41,6 +40,7 @@ env.Alias('controller/flaky-test', [
     'controller/src/ifmap:flaky-test',
     'controller/src/io:flaky-test',
     'controller/src/xmpp:flaky-test',
+    'controller/src/api-lib:flaky-test',
     'controller/src/config/device-manager:flaky-test',
 ])
 
diff --git a/src/api-lib/SConscript b/src/api-lib/SConscript
index 649177f9555..980655b110c 100644
--- a/src/api-lib/SConscript
+++ b/src/api-lib/SConscript
@@ -123,6 +123,6 @@ test_depends = ['/config/common/dist/cfgm_common-0.1dev.tar.gz']
 env.Depends(test_cmd, [env['TOP']+x for x in test_depends])
 env.Depends(cov_cmd, [env['TOP']+x for x in test_depends])
 
-env.Alias('test', test_cmd)
-env.Alias('controller/src/api-lib:test', test_cmd)
+env.Alias('flaky-test', test_cmd)
+env.Alias('controller/src/api-lib:flaky-test', test_cmd)
 env.Alias('controller/src/api-lib:coverage', cov_cmd)