       (fs/touch facter-jar)
       (bootstrap/with-app-with-config
         app
-        [jruby-puppet-pooled-service profiler/puppet-profiler-service]
+        default-services
         (assoc-in (jruby-service-test-config 1)
           [:jruby-puppet :ruby-load-path]
           (into [] (cons (fs/absolute-path temp-dir)
                      jruby-testutils/ruby-load-path)))
+        ;; This test doesn't technically need to wait for jruby pool
+        ;; initialization to be done but if it doesn't, the pool initialization
+        ;; may continue on during the execution of a subsequent test and
+        ;; interfere with the next test's results.  This wait ensures that the
+        ;; pool initialization agent will be dormant by the time this test
+        ;; finishes.  It should be possible to remove this when SERVER-1087 is
+        ;; resolved.
+        (jruby-testutils/wait-for-jrubies app)
         (is (true? (some #(= facter-jar (.getFile %))
                      (.getURLs (ClassLoader/getSystemClassLoader)))))))))

        app
        default-services
        (jruby-service-test-config-with-timeouts connect-timeout socket-timeout)
        (let [service          (app/get-service app :JRubyPuppetService)
              context          (services/service-context service)
              pool-context-cfg (get-in context [:pool-context :config])]

      app
      default-services
      (jruby-service-test-config 1)
      ;; This test doesn't technically need to wait for jruby pool
      ;; initialization to be done but if it doesn't, the pool initialization
      ;; may continue on during the execution of a subsequent test and
      ;; interfere with the next test's results.  This wait ensures that the
      ;; pool initialization agent will be dormant by the time this test
      ;; finishes.  It should be possible to remove this when SERVER-1087 is
      ;; resolved.
      (jruby-testutils/wait-for-jrubies app)
      (let [service          (app/get-service app :JRubyPuppetService)
            context          (services/service-context service)
            pool-context-cfg (get-in context [:pool-context :config])]
