diff --git a/emsdk.py b/emsdk.py
index 1f57332..783fa3b 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -2648,7 +2648,8 @@ def expand_sdk_name(name):
   elif name == 'tot-upstream':
     return str(find_tot_sdk('upstream'))
   elif name in ('tot-fastcomp', 'sdk-nightly-latest'):
-    return str(find_tot_sdk('fastcomp'))
+    print('error: The fastcomp compiler is not available tot/nightly builds. Please use the upstream llvm backend or use an older version than 2.0.0.')
+    sys.exit(1)
   else:
     # check if it's a release handled by an emscripten-releases version,
     # and if so use that by using the right hash. we support a few notations,
@@ -2664,6 +2665,9 @@ def expand_sdk_name(name):
       fullname = fullname.replace('-fastcomp', '')
       backend = 'fastcomp'
     fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
+    if backend == 'fastcomp' and version_key(fullname) >= (2, 0, 0):
+      print('error: The fastcomp compiler is not available in 2.0.0+. Please use the upstream llvm backend or use an older version than 2.0.0.')
+      sys.exit(1)
     releases_info = load_releases_info()['releases']
     release_hash = get_release_hash(fullname, releases_info)
     if release_hash:
diff --git a/scripts/test.py b/scripts/test.py
index ba8d96f..c34aba5 100755
--- a/scripts/test.py
+++ b/scripts/test.py
@@ -169,11 +169,6 @@ assert old_config == open(emconfig + '.old').read()
 # TODO; test on latest as well
 check_call(upstream_emcc + ' hello_world.c')
 
-print('test tot-fastcomp')
-run_emsdk('install tot-fastcomp')
-run_emsdk('activate tot-fastcomp')
-check_call(fastcomp_emcc + ' hello_world.c')
-
 print('test specific release (old)')
 run_emsdk('install sdk-fastcomp-1.38.31-64bit')
 run_emsdk('activate sdk-fastcomp-1.38.31-64bit')