diff --git a/lib/measures/create_DOE_prototype_building/measure.rb b/lib/measures/create_DOE_prototype_building/measure.rb
index 251d50d..96154aa 100644
--- a/lib/measures/create_DOE_prototype_building/measure.rb
+++ b/lib/measures/create_DOE_prototype_building/measure.rb
@@ -141,7 +141,7 @@ def run(model, runner, user_arguments)
     @runner = runner
 
     # Make a directory to save the resulting models for debugging
-    build_dir = "#{Dir.pwd}/output"
+    build_dir = "#{__dir__}/output"
     if !Dir.exist?(build_dir)
       Dir.mkdir(build_dir)
     end
diff --git a/lib/measures/create_baseline_building/measure.rb b/lib/measures/create_baseline_building/measure.rb
index ff15de2..999df62 100644
--- a/lib/measures/create_baseline_building/measure.rb
+++ b/lib/measures/create_baseline_building/measure.rb
@@ -187,7 +187,7 @@ def run(model, runner, user_arguments)
     end
 
     # Make a directory to save the resulting models for debugging
-    build_dir = "#{Dir.pwd}/output"
+    build_dir = "#{__dir__}/output"
     if !Dir.exist?(build_dir)
       Dir.mkdir(build_dir)
     end
diff --git a/lib/measures/create_baseline_building/tests/create_baseline_building_test.rb b/lib/measures/create_baseline_building/tests/create_baseline_building_test.rb
index 56fb096..0af1997 100644
--- a/lib/measures/create_baseline_building/tests/create_baseline_building_test.rb
+++ b/lib/measures/create_baseline_building/tests/create_baseline_building_test.rb
@@ -72,7 +72,7 @@ def apply_measure_to_model(model_name, standard, climate_zone, building_type)
     # Ensure the measure finished as expected
     assert(result.value.valueName == 'Success')
 
-    model.save(OpenStudio::Path.new("output/#{model_name}_baseline.osm"), true)
+    model.save(OpenStudio::Path.new("#{@test_dir}/#{model_name}_baseline.osm"), true)
 
     return model
   end