diff --git a/src/spectator/dsl/mocks.cr b/src/spectator/dsl/mocks.cr
index 452fd65..5b195bd 100644
--- a/src/spectator/dsl/mocks.cr
+++ b/src/spectator/dsl/mocks.cr
@@ -18,25 +18,18 @@ module Spectator::DSL
   end
 
   macro mock(name, &block)
-    {% if block.is_a?(Nop) %}
-      {{name}}.new.tap do |%inst|
-        %inst.spectator_test = self
-      end
-    {% else %}
-      {% resolved = name.resolve
-         type = if resolved < Reference
-                  :class
-                elsif resolved < Value
-                  :struct
-                else
-                  :module
-                end %}
+    {% resolved = name.resolve
+       type = if resolved < Reference
+                :class
+              elsif resolved < Value
+                :struct
+              else
+                :module
+              end %}
+    {% begin %}
       {{type.id}} ::{{resolved.id}}
         include ::Spectator::Mocks::Stubs
 
-        @spectator_stubs = Deque(::Spectator::Mocks::MethodStub).new
-        @spectator_stub_calls = Deque(::Spectator::Mocks::MethodCall).new
-
         {{block.body}}
       end
     {% end %}