diff --git a/test/fixtures/execution/array_comprehension.js b/test/fixtures/execution/array_comprehension.js
deleted file mode 100644
index 5bdaeee9..00000000
--- a/test/fixtures/execution/array_comprehension.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function(){
-  var nums;
-  var a = [1, 2, 3];
-  var d = [];
-  for (var b=0, c=a.length; b<c; b++) {
-    var n = a[b];
-    if (n % 2 !== 0) {
-      nums = d.push(n * n);
-    }
-  }
-  nums = d;
-  var result;
-  var e = nums;
-  var h = [];
-  for (var f=0, g=e.length; f<g; f++) {
-    n = e[f];
-    h[f] = n * 2;
-  }
-  result = h;
-  print(result.join(',') === '2,18');
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/assign_to_try_catch.js b/test/fixtures/execution/assign_to_try_catch.js
deleted file mode 100644
index d0ef6817..00000000
--- a/test/fixtures/execution/assign_to_try_catch.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function(){
-  var result;
-  try {
-    result = nonexistent * missing;
-  } catch (error) {
-    result = true;
-  }
-  print(result);
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/calling_super.js b/test/fixtures/execution/calling_super.js
deleted file mode 100644
index dfd3d99a..00000000
--- a/test/fixtures/execution/calling_super.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function(){
-  var Base = function() {
-  };
-  Base.prototype.func = function(string) {
-    return 'zero/' + string;
-  };
-  var FirstChild = function() {
-  };
-  FirstChild.prototype.__proto__ = new Base();
-  FirstChild.prototype.func = function(string) {
-    return FirstChild.prototype.__proto__.func.call(this, 'one/') + string;
-  };
-  var SecondChild = function() {
-  };
-  SecondChild.prototype.__proto__ = new FirstChild();
-  SecondChild.prototype.func = function(string) {
-    return SecondChild.prototype.__proto__.func.call(this, 'two/') + string;
-  };
-  var ThirdChild = function() {
-  };
-  ThirdChild.prototype.__proto__ = new SecondChild();
-  ThirdChild.prototype.func = function(string) {
-    return ThirdChild.prototype.__proto__.func.call(this, 'three/') + string;
-  };
-  var result = (new ThirdChild()).func('four');
-  print(result === 'zero/one/two/three/four');
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/fancy_if_statement.js b/test/fixtures/execution/fancy_if_statement.js
deleted file mode 100644
index dd1f1d49..00000000
--- a/test/fixtures/execution/fancy_if_statement.js
+++ /dev/null
@@ -1,6 +0,0 @@
-(function(){
-  var a = b = d = true;
-  var c = false;
-  var result = a ? b ? c ? false : d ? true : null : null : null;
-  print(result);
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/keyword_operators.js b/test/fixtures/execution/keyword_operators.js
deleted file mode 100644
index ffccad4c..00000000
--- a/test/fixtures/execution/keyword_operators.js
+++ /dev/null
@@ -1,10 +0,0 @@
-(function(){
-  var a = 5;
-  var atype = typeof a;
-  var b = "hello";
-  var btype = typeof b;
-  var Klass = function() {
-  };
-  var k = new Klass();
-  print(atype === 'number' && btype === 'string' && k instanceof Klass);
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/test_everything.cs b/test/fixtures/execution/test_everything.cs
index aed47da8..827c80e1 100644
--- a/test/fixtures/execution/test_everything.cs
+++ b/test/fixtures/execution/test_everything.cs
@@ -16,7 +16,7 @@ func: =>
   else
     c.text + '---'.
 
-  c.list: let for let in c.text.split('') if let is '-'.
+  c.list: l for l in c.text.split('') if l is '-'.
 
   c.single: c.list[1, 1][0].
 
diff --git a/test/fixtures/execution/test_everything.js b/test/fixtures/execution/test_everything.js
deleted file mode 100644
index 72a9a585..00000000
--- a/test/fixtures/execution/test_everything.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function(){
-  var func = function() {
-    var a = 3;
-    var b = [];
-    while (a >= 0) {
-      b.push('o');
-      a--;
-    }
-    var c = {
-      "text": b
-    };
-    if (!(42 > 41)) {
-      c = 'error';
-    }
-    c.text = false ? 'error' : c.text + '---';
-    var d = c.text.split('');
-    var g = [];
-    for (var e=0, f=d.length; e<f; e++) {
-      var let = d[e];
-      if (let === '-') {
-        c.list = g.push(let);
-      }
-    }
-    c.list = g;
-    c.single = c.list.slice(1, 1 + 1)[0];
-    return c.single;
-  };
-  print(func() === '-');
-})();
\ No newline at end of file
diff --git a/test/fixtures/execution/test_switch.js b/test/fixtures/execution/test_switch.js
deleted file mode 100644
index 05874d4e..00000000
--- a/test/fixtures/execution/test_switch.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function(){
-  var num = 10;
-  var result;
-  if (num === 5) {
-    result = false;
-  } else if (num === 'a') {
-    result = false;
-  } else if (num === 10) {
-    result = true;
-  } else if (num === 11) {
-    result = false;
-  } else {
-    result = false;
-  }
-  print(result);
-})();
\ No newline at end of file
diff --git a/test/unit/test_execution.rb b/test/unit/test_execution.rb
index 31a2aee9..3021a6b7 100644
--- a/test/unit/test_execution.rb
+++ b/test/unit/test_execution.rb
@@ -5,17 +5,11 @@ class ExecutionTest < Test::Unit::TestCase
   NO_WARNINGS = /\A(0 error\(s\), 0 warning\(s\)\n)+\Z/
 
   def test_execution_of_coffeescript
-    `bin/coffee-script test/fixtures/execution/*.cs`
-    sources = Dir['test/fixtures/execution/*.js'].map {|f| File.expand_path(f) }
-    starting_place = File.expand_path(Dir.pwd)
-    Dir.chdir('/Users/jashkenas/Desktop/Beauty/Code/v8')
-    sources.each do |source|
-      suceeded = `./shell #{source}`.chomp.to_sym == :true
+    Dir['test/fixtures/execution/*.cs'].each do |source|
+      suceeded = `bin/cs #{source}`.chomp.to_sym == :true
       puts "failed: #{source}" unless suceeded
       assert suceeded
     end
-  ensure
-    Dir.chdir(starting_place)
   end
 
   def test_lintless_coffeescript