diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk
index 00cb6956..19575411 100644
--- a/src/incmake/component_CCPP.mk
+++ b/src/incmake/component_CCPP.mk
@@ -3,15 +3,18 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk
 all_component_mk_files+=$(ccpp_mk)
 
 # Location of source code and installation
-CCPP_SRCDIR?=$(ROOTDIR)/ccpp
-CCPP_BINDIR?=$(ROOTDIR)/ccpp
+CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp
+CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp
+
+# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build
+CCPP_BUILDDIR?=$(ROOTDIR)/FV3
 
 # Make sure we have a model that supports CCPP:
 ifeq (,$(findstring FV3,$(COMPONENTS)))
   $(error CCPP requires FV3)
 else
   # Ensure the model is selected.
-  override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py
+  override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR)
   override CCPP_MAKEOPT ?= $(FV3_MAKEOPT)
   override CCPP_BUILDOPT ?= $(FV3_BUILDOPT)
 endif
@@ -47,7 +50,7 @@ $(ccpp_mk): configure
 	set -xue                                                        ; \
 	export PATH_CCPP="$(CCPP_SRCDIR)"                               ; \
 	cd $(ROOTDIR)                                                   ; \
-	./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT)       ; \
+	$$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT)  ; \
 	cd $$PATH_CCPP                                                  ; \
 	./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk)          \
 	  "$(CCPP_MAKEOPT)" NO NO                                       ; \
@@ -58,12 +61,13 @@ $(ccpp_mk): configure
 
 # Rule for cleaning intermediate files
 distclean_CCPP: clean_CCPP
-	set -x                                                          ; \
+	set -xue                                                        ; \
+	export PATH_CCPP="$(CCPP_SRCDIR)"                               ; \
 	cd $(ROOTDIR)                                                   ; \
-	./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \
-	cd "$(CCPP_SRCDIR)"                                             ; \
-	rm -rf "$(CCPP_SRCDIR)/lib"                                     ; \
-	rm -rf "$(CCPP_SRCDIR)/include"                                 ; \
+	$$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT) --clean ; \
+	cd $$PATH_CCPP                                                  ; \
+	rm -rf "$(CCPP_BINDIR)/lib"                                     ; \
+	rm -rf "$(CCPP_BINDIR)/include"                                 ; \
 	rm -f $(ccpp_mk)
 
 clean_CCPP:
diff --git a/tests/rtgen b/tests/rtgen
index f1b1b0d2..ea0db17c 100755
--- a/tests/rtgen
+++ b/tests/rtgen
@@ -929,12 +929,9 @@ class RTGen(TestGen):
             out.write('module load emc-utils/1.0.0 ; export have_qoutql=YES\n')
         elif 'jet' in here.name:
             out.write('module load hpss\n')
-            out.write('module use /lfs3/projects/hwrf-vd/soft/modulefiles\n')
-            out.write('module load rocoto/1.3.0rc2\n')
+            out.write('module load rocoto/1.3.1\n')
             out.write('module use /misc/contrib/emc-utils/modulefiles\n')
             out.write('module load emc-utils/1.1.0\n')
-            #if produtil.fileop.find_exe('sbatch',raise_missing=False):
-            #    out.write('module load slurm\n')
             out.write('have_qoutql=YES\n')
         elif here.name == 'hera':
             out.write('module use /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles/\n')