diff --git a/Tests/Tools/ToolsTest.j b/Tests/Tools/ToolsTest.j
index 32db4c7c3..bf541005a 100644
--- a/Tests/Tools/ToolsTest.j
+++ b/Tests/Tools/ToolsTest.j
@@ -7,11 +7,10 @@ function cleanup() {
             FILE.rmtree(dir);
     });
 
-    if (FILE.isFile("objj2objcskeletonTestFile.h"))
-        FILE.remove("objj2objcskeletonTestFile.h");
-
-    if (FILE.isFile("objj2objcskeletonTestFile.m"))
-        FILE.remove("objj2objcskeletonTestFile.m");
+    ["objj2objcskeletonTestFile.h", "objj2objcskeletonTestFile.m", "objj2objcskeletonTestFile.j"].forEach(function(file) {
+        if (FILE.isFile(file))
+            FILE.remove(file);
+    });
 }
 
 @implementation ToolsTest : OJTestCase
@@ -45,6 +44,8 @@ function cleanup() {
     status = OS.system(["objj", "-I", "ToolsTestApp/Frameworks", "ToolsTestApp/AppController.j"]);
     [self assert:0 equals:status message:"objj failed with options -I"];
 
+    FILE.write("objj2objcskeletonTestFile.j", "@import <Foundation/CPObject.j>\n@import <AppKit/AppKit.j>\n\n\n@implementation AppController : CPObject\n{\n    @outlet CPSplitView splitViewA;\n    @outlet CPSplitView splitViewB;\n    @outlet CPSplitView splitViewC;\n}\n\n@end");
+
     status = OS.system(["objj2objcskeleton", "objj2objcskeletonTestFile.j", "."]);
     [self assert:0 equals:status message:"objj2objcskeleton failed"];
 
diff --git a/Tests/Tools/objj2objcskeletonTestFile.j b/Tests/Tools/objj2objcskeletonTestFile.j
deleted file mode 100644
index 20ac21c55..000000000
--- a/Tests/Tools/objj2objcskeletonTestFile.j
+++ /dev/null
@@ -1,12 +0,0 @@
-@import <Foundation/CPObject.j>
-@import <AppKit/AppKit.j>
-
-
-@implementation AppController : CPObject
-{
-    @outlet CPSplitView splitViewA;
-    @outlet CPSplitView splitViewB;
-    @outlet CPSplitView splitViewC;
-}
-
-@end
\ No newline at end of file