diff --git a/scripts/Makefile b/scripts/Makefile
index 7171cbc7bd..c1d33bf901 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -218,7 +218,7 @@ pester-tests: $(RUN_TARGETS) prepare
 hashbang-tests: all prepare
 	PATH=$(PATH):$(MONAD)/scripts/$(APP_BASE) $(MONAD)/scripts/3rdparty/hashbang/script.ps1
 
-test: native-tests xunit-tests pester-tests hashbang-tests
+test: native-tests xunit-tests pester-tests hashbang-tests psrp-tests
 
 # debug/trace targets
 
@@ -228,22 +228,53 @@ trace: $(RUN_TARGETS) prepare
 run-debugclr: $(RUN_TARGETS) prepare
 	PAL_DBG_CHANNELS="+LOADER.TRACE" $(APP_BASE)/runps-simple.sh get-location
 
+# OMI
+OMI=$(MONAD)/src/omi/Unix
+OMI_FLAGS=--dev --enable-debug
+$(OMI)/GNUmakefile:
+	cd $(OMI) && ./configure $(OMI_FLAGS)
+
+$(OMI)/output/bin/omiserver: $(OMI)/GNUmakefile
+	$(MAKE) -j -C $(OMI)
+
+omi: $(OMI)/output/bin/omiserver
+
+MONAD_PROVIDER=$(MONAD)/src/monad-omi-provider
+$(OMI)/output/lib/libTestShell.so: omi
+	$(MAKE) -j -C $(MONAD_PROVIDER)
+
+psrp: $(OMI)/output/lib/libTestShell.so
+
+psrp-tests: omi
+	$(MAKE) -C $(OMI) tests
+
 # quoting here is a bit special if strings are passed in, because lldb
 # seems to forward arguments strangely
 debug: $(RUN_TARGETS) prepare
 	$(APP_BASE)/runps-simple-debug.sh get-location
 
 # Cleaning
-.PHONY: clean-native clean cleanall
+clean-provider:
+	-$(MAKE) -j -C $(MONAD_PROVIDER) clean
+
+clean-omi:
+	-$(MAKE) -j -C $(OMI) clean
+
+distclean-omi:
+	-$(MAKE) -j -C $(OMI) distclean
+
+clean-psrp: clean-provider clean-omi
 
 clean-native:
-	rm -rf $(LIBPS_BUILD)
+	-rm -rf $(LIBPS_BUILD)
 
 clean:
-	rm -rf dotnetlibs/* exec_env powershell.inc *-tests.xml
+	-rm -rf dotnetlibs/* exec_env powershell.inc *-tests.xml
 
-cleanall: clean clean-native
-	rm -rf buildtemp
+distclean: clean clean-native distclean-omi clean-provider
+	-rm -rf buildtemp
+
+cleanall: distclean
 
 # Shell-in-a-box Docker setup
 
diff --git a/src/monad-omi-provider b/src/monad-omi-provider
index 7c7307925b..c78817be4b 160000
--- a/src/monad-omi-provider
+++ b/src/monad-omi-provider
@@ -1 +1 @@
-Subproject commit 7c7307925b81420bb6d8520a51bc759b4d52ea0a
+Subproject commit c78817be4b9f488ad05184c733a69770a1d849aa
diff --git a/src/omi b/src/omi
index 1f81decc6a..7ddc081ca0 160000
--- a/src/omi
+++ b/src/omi
@@ -1 +1 @@
-Subproject commit 1f81decc6a74f1de619659a4dd8359b66814189b
+Subproject commit 7ddc081ca010ac830ae09691a7f4f17244c6cd30