diff --git a/src/proto_alpha/lib_protocol/test/jbuild b/src/proto_alpha/lib_protocol/test/jbuild
index 8583d4f42..e4a4e2ae9 100644
--- a/src/proto_alpha/lib_protocol/test/jbuild
+++ b/src/proto_alpha/lib_protocol/test/jbuild
@@ -1,7 +1,7 @@
 (jbuild_version 1)
 
-(executables
- ((names (test_isolate_main))
+(executable
+ ((name main)
   (libraries (tezos-base
               tezos-test-helpers
               tezos_proto_alpha_isolate_helpers
@@ -14,18 +14,18 @@
 (alias
  ((name buildtest)
   (package tezos-protocol-alpha)
-  (deps (test_isolate_main.exe))))
+  (deps (main.exe))))
 
 (alias
- ((name runtest_isolate_main)
+ ((name runtest_proto_alpha)
   (package tezos-protocol-alpha)
   (deps (sandbox.json (glob_files contracts/*.tz)))
-  (action (chdir ${ROOT} (run ${exe:test_isolate_main.exe} ${path-no-dep:contracts})))))
+  (action (chdir ${ROOT} (run ${exe:main.exe} ${path-no-dep:contracts})))))
 
 (alias
  ((name runtest)
   (package tezos-protocol-alpha)
-  (deps ((alias runtest_isolate_main)))))
+  (deps ((alias runtest_proto_alpha)))))
 
 (alias
  ((name runtest_indent)
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_main.ml b/src/proto_alpha/lib_protocol/test/main.ml
similarity index 79%
rename from src/proto_alpha/lib_protocol/test/test_isolate_main.ml
rename to src/proto_alpha/lib_protocol/test/main.ml
index 0b22abed5..8aa94d7d7 100644
--- a/src/proto_alpha/lib_protocol/test/test_isolate_main.ml
+++ b/src/proto_alpha/lib_protocol/test/main.ml
@@ -10,8 +10,8 @@
 let () =
   let module Test = Test.Make(Error_monad) in
   Test.run "proto_alpha."
-    ( Test_isolate_dsl.tests @
-      Test_isolate_transaction.tests @
-      Test_isolate_endorsement.tests @
-      Test_isolate_origination.tests @
-      Test_isolate_michelson.tests )
+    ( Test_dsl.tests @
+      Test_transaction.tests @
+      Test_endorsement.tests @
+      Test_origination.tests @
+      Test_michelson.tests )
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_dsl.ml b/src/proto_alpha/lib_protocol/test/test_dsl.ml
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/test_isolate_dsl.ml
rename to src/proto_alpha/lib_protocol/test/test_dsl.ml
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_endorsement.ml b/src/proto_alpha/lib_protocol/test/test_endorsement.ml
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/test_isolate_endorsement.ml
rename to src/proto_alpha/lib_protocol/test/test_endorsement.ml
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_michelson.ml b/src/proto_alpha/lib_protocol/test/test_michelson.ml
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/test_isolate_michelson.ml
rename to src/proto_alpha/lib_protocol/test/test_michelson.ml
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_origination.ml b/src/proto_alpha/lib_protocol/test/test_origination.ml
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/test_isolate_origination.ml
rename to src/proto_alpha/lib_protocol/test/test_origination.ml
diff --git a/src/proto_alpha/lib_protocol/test/test_isolate_transaction.ml b/src/proto_alpha/lib_protocol/test/test_transaction.ml
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/test_isolate_transaction.ml
rename to src/proto_alpha/lib_protocol/test/test_transaction.ml