diff --git a/test/crop_tests.jl b/test/crop_tests.jl
index f404a3e7d389f6b49004e28dd88035965f290678..17ec1806a3fbf8780c9e9448218e2feeae20e13a 100644
--- a/test/crop_tests.jl
+++ b/test/crop_tests.jl
@@ -31,7 +31,7 @@ end
     mature = false
     events = Ps.Management[]
     force_growth = false
-    fp = FarmPlot(id, pixels, farmer, Ps.soiltype_nodata, Ps.ALMaSS.CropState(croptype=ct, phase=Ps.ALMaSS.janfirst))
+    fp = FarmPlot(id, pixels, farmer, Ps.nosoildata, Ps.ALMaSS.CropState(croptype=ct, phase=Ps.ALMaSS.janfirst))
     @test fp isa FarmPlot
     @test fp isa FarmPlot{Ps.ALMaSS.CropState}
     @test croptype(fp) isa Ps.ALMaSS.CropType
@@ -46,7 +46,7 @@ end
     id = 0
     pixels = [(0, 0)]
     farmer = 0
-    fp = FarmPlot(id, pixels, farmer, Ps.soiltype_nodata, Ps.SimpleCrop.CropState(ct, 0.0cm))
+    fp = FarmPlot(id, pixels, farmer, Ps.nosoildata, Ps.SimpleCrop.CropState(ct, 0.0cm))
     @test fp isa FarmPlot
     @test fp isa FarmPlot{Ps.SimpleCrop.CropState}
     @test croptype(fp) isa Ps.SimpleCrop.CropType
diff --git a/test/nature_tests.jl b/test/nature_tests.jl
index fcbf97f5e4f1518d1307e13315ed9b26b323d2b9..84ba55ddcfb720f3dbb438d4bfafda66d7bb796b 100644
--- a/test/nature_tests.jl
+++ b/test/nature_tests.jl
@@ -47,9 +47,9 @@ end) # end eval
 @testset "Habitat macros" begin
     # set up the testing landscape
     model = inittestmodel()
-    model.landscape[6,6] = Pixel(Ps.agriculture, Ps.soiltype_sand, 1, [], [], [])
+    model.landscape[6,6] = Pixel(Ps.agriculture, Ps.sand, 1, [], [], [])
     fp = Ps.FarmPlot(
-        1, [(6,6)], 1, Ps.soiltype_nodata,
+        1, [(6,6)], 1, Ps.nosoildata,
         Ps.ALMaSS.CropState(
             croptype = model.crops["winter wheat"],
             phase = Ps.ALMaSS.janfirst,