diff --git a/plugins/tinytest/index.coffee b/plugins/tinytest/index.coffee
index ce4b54383..357439e0b 100644
--- a/plugins/tinytest/index.coffee
+++ b/plugins/tinytest/index.coffee
@@ -1,3 +1 @@
-exports.TinyTest = TinyTest = require 'tinytest/tinytest'
-
-new TinyTest
\ No newline at end of file
+module.exports = require 'tinytest/tinytest'
diff --git a/plugins/tinytest/tinytest.coffee b/plugins/tinytest/tinytest.coffee
index eff6ea956..daa06ebc4 100644
--- a/plugins/tinytest/tinytest.coffee
+++ b/plugins/tinytest/tinytest.coffee
@@ -3,17 +3,17 @@ _ = require 'underscore'
 
 Pane = require 'pane'
 File = require 'fs'
-{activeWindow} = App = require 'app'
+Plugin = require 'plugin'
 
 {CoffeeScript} = require 'coffee-script'
 
 module.exports =
-class TinyTest extends Pane
+class TinyTest extends Plugin
   keymap: ->
     'Command-Ctrl-T': 'runTests'
 
   runTests: ->
-    _.map File.list(App.root + '/test'), @runTest
+    _.map File.list(@window.path + '/test'), @runTest
 
   runTest: (path) ->
     # Even though we already have the path, run it