diff --git a/lib/fakefs/file.rb b/lib/fakefs/file.rb
index 01931c6..0fe0c8c 100644
--- a/lib/fakefs/file.rb
+++ b/lib/fakefs/file.rb
@@ -337,7 +337,7 @@ module FakeFS
     end
 
     def flock(locking_constant)
-      raise NotImplementedError
+      #raise NotImplementedError
     end
 
     def mtime
diff --git a/test.watchr b/test.watchr
new file mode 100644
index 0000000..a03b4d1
--- /dev/null
+++ b/test.watchr
@@ -0,0 +1,6 @@
+watch('test/.*_test.rb') { run_tests }
+watch('lib/.*.rb') { run_tests }
+
+def run_tests
+	system 'rake test'
+end