diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
index 91d5e055323720e7ccc298d354bee35d7ad50b92..6e73c3af2c14fef875831b0523f941900e47cd0a 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
@@ -14,7 +14,5 @@
 
 # Alias   DestIP    DestMAC             BGP node
 #-------------------------------------------------
-test1 10.170.1.17   00:14:5E:7D:96:38   R01-M0-N04-J00
-test2 10.170.1.18   00:14:5E:7D:96:39   R01-M0-N04-J01
-test3 10.170.1.21   00:14:5E:7D:94:80   R01-M0-N05-J00   
-test4 10.170.1.22   00:14:5E:7D:94:81   R01-M0-N05-J01
+test1 10.170.1.1    00:14:5E:7D:1E:53   R01-M0-N00-J00
+test2 10.170.1.33   00:14:5E:7D:1D:1B   R01-M0-N08-J00
diff --git a/RTCP/Run/src/BlueGeneControl.conf b/RTCP/Run/src/BlueGeneControl.conf
index daa66548b3f124f066ec9235b3f711b2d8dc9c44..c63cdaed86fa1b1cd1e8102fe053a104f531307d 100644
--- a/RTCP/Run/src/BlueGeneControl.conf
+++ b/RTCP/Run/src/BlueGeneControl.conf
@@ -8,7 +8,7 @@ if [ "$USER" == "lofarsys" ]
 then
   if [ "`basename $HOME`" == "lofartest" ]
   then
-    PARTITION=R01-M0-N04-64 # test partition
+    PARTITION=LOFARTEST     # test partition
   else
     PARTITION=R00           # production partition
   fi
diff --git a/RTCP/Run/src/LOFAR/Parset.py b/RTCP/Run/src/LOFAR/Parset.py
index de3445852ba486a9ccbd94b957b2c15a79ceaa42..326be0bdd4dd482f822f5fce8c6de3154734b70c 100644
--- a/RTCP/Run/src/LOFAR/Parset.py
+++ b/RTCP/Run/src/LOFAR/Parset.py
@@ -116,7 +116,7 @@ class Parset(util.Parset.Parset):
         if partition:
           self.setPartition( partition )
 
-        if self.partition and self.partition != "R00R01":  
+        if self.partition and self.partition != "R00R01" and self.partition != "LOFARTEST":  
           overrideRack( Stations, int(self.partition[2]) )
 
         # storage nodes
diff --git a/RTCP/Run/src/LOFAR/Partitions.py b/RTCP/Run/src/LOFAR/Partitions.py
index d19ecd8a61ac6f2ff96e1e39a3dd1e6fa8fa39ab..4e849f30ec8b0b84a786502135606d0d3f2452b7 100755
--- a/RTCP/Run/src/LOFAR/Partitions.py
+++ b/RTCP/Run/src/LOFAR/Partitions.py
@@ -18,6 +18,8 @@ sys.path += [os.path.abspath(os.path.dirname(__file__)+"/..")]
 # R00-M0         = R00-M0-N00-256 + R00-M0-N08-256
 # R00            = R00-M0 + R00-M1
 
+# LOFARTEST      = R01-M0-N00-J00 + R01-M0-N08-J00
+
 PartitionPsets = {}
 for R in xrange(3):
   rack = "R%02d" % R
@@ -51,6 +53,7 @@ for R in xrange(3):
   PartitionPsets[rack] = PartitionPsets["%s-M0" % rack] + PartitionPsets["%s-M1" % rack]
 
 PartitionPsets["R00R01"] = PartitionPsets["R00"] + PartitionPsets["R01"]  
+PartitionPsets["LOFARTEST"] = PartitionPsets["R01-M0-N00-J00"] + PartitionPsets["R01-M0-N08-J00"]  
 
 if __name__ == "__main__":
   from optparse import OptionParser,OptionGroup
diff --git a/RTCP/Run/src/locations.sh.in b/RTCP/Run/src/locations.sh.in
index 53929e9af088697e24b8370b8901fe6f08e611aa..1e4b06cc4fd4e3532fd78f0b7e5864f4b40b4554 100644
--- a/RTCP/Run/src/locations.sh.in
+++ b/RTCP/Run/src/locations.sh.in
@@ -102,6 +102,14 @@ fi
 
 
 function set_psetinfo() {
+  if [ "$PARTITION" == "LOFARTEST" ]
+  then
+    PSETS="10.170.1.1,10.170.1.33"
+    FIRSTPSET="10.170.1.1"
+
+    return
+  fi
+
   # list both the partition directly (small partitions) and recursively (large partitions) to get all -32 subpartitions
   # bghierarchy needs a valid stdin for some reason and will read from it, so provide a fake one
   if [ "$PARTITION" == "R00R01" ]